incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r827952 [1/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...
Date Wed, 21 Oct 2009 10:29:59 GMT
Author: spoole
Date: Wed Oct 21 10:29:55 2009
New Revision: 827952

URL: http://svn.apache.org/viewvc?rev=827952&view=rev
Log:
renamed javaruntime classes from Java* to JVM*   This is the first step in adding the new third view

Removed:
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaClass.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaClassLoader.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaField.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaHeap.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaLocation.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMember.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMethod.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMonitor.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaObject.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaReference.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaRuntime.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaStackFrame.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaThread.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVMInitArgs.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVMOption.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVariable.java
Modified:
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/FactoryRegistry.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageFactory.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageProcess.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/ManagedRuntime.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/test/java/test/apache/kato/TestFactoryRegistry.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JHeap.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/image/ImageFactoryImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/IJavaHeapInternal.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassLoaderImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaHeapImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectArrayImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectInstanceImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveArrayImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveClassImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaRuntimeImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaSyntheticPrimitiveArrayImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaThreadImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaHeapImplTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaPrimitiveClassImplTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/AbstractHProfTestCase.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/TestImageProcess.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaHeap.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaRuntime.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/KatoReader.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/XMLReader.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.classpath
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.settings/org.eclipse.jdt.core.prefs
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/IJavaRuntimeCreator.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getCompiledMethods.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThreadInspection.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/AbstractDTFJTestcase.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassLoaderTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaFieldTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaHeapTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaLocationTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaMethodTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaMonitorTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaObjectTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaRuntimeTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaStackFrameTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaThreadTest.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/DeadlockCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HeapdumpCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XPathCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ClassOutput.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaClassVisitor.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaObjectVisitor.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/FactoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/FactoryRegistry.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/FactoryRegistry.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/FactoryRegistry.java Wed Oct 21 10:29:55 2009
@@ -22,7 +22,7 @@
 import javax.imageio.spi.ServiceRegistry;
 import javax.tools.diagnostics.image.Image;
 import javax.tools.diagnostics.image.ImageFactory;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 
 /**
@@ -199,7 +199,7 @@
 	 * @return Image or null
 	 * 
 	 */
-	public JavaRuntime getJavaRuntime(File file) throws IOException {
+	public JVMRuntime getJVMRuntime(File file) throws IOException {
 			if(file==null) throw new IllegalArgumentException("file is null");
 		
 			String fileName=file.getName();

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageFactory.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageFactory.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageFactory.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageFactory.java Wed Oct 21 10:29:55 2009
@@ -16,7 +16,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 /**
  * <p>
@@ -120,5 +120,5 @@
 	 * @return an instance of JavaRuntime
 	 * @throws IOException if unable to create a runtime from the provided file 
 	 */
-	public JavaRuntime getJavaRuntime(File file) throws IOException;
+	public JVMRuntime getJavaRuntime(File file) throws IOException;
 }

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageProcess.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageProcess.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageProcess.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/ImageProcess.java Wed Oct 21 10:29:55 2009
@@ -114,7 +114,7 @@
      * 
      * 
      * @see javax.tools.diagnostics.runtime.ManagedRuntime 
-     * @see javax.tools.diagnostics.runtime.java.JavaRuntime
+     * @see javax.tools.diagnostics.runtime.java.JVMRuntime
      */
     List<ManagedRuntime> getRuntimes();
     

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/ManagedRuntime.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/ManagedRuntime.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/ManagedRuntime.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/ManagedRuntime.java Wed Oct 21 10:29:55 2009
@@ -24,7 +24,7 @@
  *  
  * <br>
  * No class should implement this interface directly. This is an marker interface which is extended by
- * specific runtime interfaces. See  {@link javax.tools.diagnostics.runtime.java.JavaRuntime} as an example of such a case.
+ * specific runtime interfaces. See  {@link javax.tools.diagnostics.runtime.java.JVMRuntime} as an example of such a case.
  * 
  */
 public interface ManagedRuntime {

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/test/java/test/apache/kato/TestFactoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/test/java/test/apache/kato/TestFactoryRegistry.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/test/java/test/apache/kato/TestFactoryRegistry.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/test/java/test/apache/kato/TestFactoryRegistry.java Wed Oct 21 10:29:55 2009
@@ -25,15 +25,15 @@
 import javax.tools.diagnostics.image.ImageFactory;
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaReference;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaThread;
-import javax.tools.diagnostics.runtime.java.JavaVMInitArgs;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMReference;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMThread;
+import javax.tools.diagnostics.runtime.java.JVMInitArgs;
 
 import junit.framework.TestCase;
 
@@ -79,33 +79,33 @@
 			return suffixes;
 		}
 		@Override
-		public JavaRuntime getJavaRuntime(File file) {
+		public JVMRuntime getJavaRuntime(File file) {
 			
 			return new MockRuntime();
 		}
 	}
-	private final class MockRuntime implements JavaRuntime {
+	private final class MockRuntime implements JVMRuntime {
 
 		@Override
-		public List<JavaMethod> getCompiledMethods() {
+		public List<JVMMethod> getCompiledMethods() {
 			// TODO Auto-generated method stub
 			return null;
 		}
 
 		@Override
-		public List<JavaReference> getHeapRoots() {
+		public List<JVMReference> getHeapRoots() {
 			// TODO Auto-generated method stub
 			return null;
 		}
 
 		@Override
-		public List<JavaHeap> getHeaps() {
+		public List<JVMHeap> getHeaps() {
 			// TODO Auto-generated method stub
 			return null;
 		}
 
 		@Override
-		public List<JavaClassLoader> getJavaClassLoaders() {
+		public List<JVMClassLoader> getJavaClassLoaders() {
 			// TODO Auto-generated method stub
 			return null;
 		}
@@ -117,20 +117,20 @@
 		}
 
 		@Override
-		public JavaVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
+		public JVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
 				CorruptDataException {
 			// TODO Auto-generated method stub
 			return null;
 		}
 
 		@Override
-		public List<JavaMonitor> getMonitors() {
+		public List<JVMMonitor> getMonitors() {
 			// TODO Auto-generated method stub
 			return null;
 		}
 
 		@Override
-		public JavaObject getObjectAtAddress(ImagePointer address)
+		public JVMObject getObjectAtAddress(ImagePointer address)
 				throws CorruptDataException, IllegalArgumentException,
 				MemoryAccessException, DataUnavailable {
 			// TODO Auto-generated method stub
@@ -138,7 +138,7 @@
 		}
 
 		@Override
-		public List<JavaThread> getThreads() {
+		public List<JVMThread> getThreads() {
 			// TODO Auto-generated method stub
 			return null;
 		}
@@ -263,7 +263,7 @@
 		
 		FactoryRegistry reg=new FactoryRegistry();
 		try {
-		reg.getJavaRuntime(null);
+		reg.getJVMRuntime(null);
 		fail("Expected illegal argument exception");
 		
 		} catch(IllegalArgumentException e) {
@@ -285,7 +285,7 @@
 		FactoryRegistry reg=new FactoryRegistry();
 		File f=new File("testfile");
 		
-		JavaRuntime result=reg.getJavaRuntime(f);
+		JVMRuntime result=reg.getJVMRuntime(f);
 		assertNull(result);
 		
 	}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java Wed Oct 21 10:29:55 2009
@@ -24,21 +24,21 @@
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaReference;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaThread;
-import javax.tools.diagnostics.runtime.java.JavaVMInitArgs;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMReference;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMThread;
+import javax.tools.diagnostics.runtime.java.JVMInitArgs;
 
 import org.apache.kato.jvmti.javaruntime.model.EmptyList;
 import org.apache.kato.jvmti.javaruntime.model.Model;
 import org.apache.kato.jvmti.reader.CLogger;
 
-public class JavaRuntimeImpl implements JavaRuntime {
+public class JavaRuntimeImpl implements JVMRuntime {
 	private static final String VERSION = "0.1.0";
 	private static final String FULL_VERSION = "CJVMTI v0.1";
 	
@@ -51,27 +51,27 @@
 	}
 	
 	@Override
-	public List<JavaMethod> getCompiledMethods() {
-		return new EmptyList<JavaMethod>();
+	public List<JVMMethod> getCompiledMethods() {
+		return new EmptyList<JVMMethod>();
 	}
 
 	@Override
-	public List<JavaReference> getHeapRoots() {
-		return new EmptyList<JavaReference>();
+	public List<JVMReference> getHeapRoots() {
+		return new EmptyList<JVMReference>();
 	}
 
-	private List<JavaHeap> heap = null;
+	private List<JVMHeap> heap = null;
 	@Override
-	public List<JavaHeap> getHeaps() {
+	public List<JVMHeap> getHeaps() {
 		 if (heap == null) {
-			 heap = new LinkedList<JavaHeap>();
+			 heap = new LinkedList<JVMHeap>();
 			 heap.add(model.getHeap());
 		 }
 		 return heap;
 	}
 
 	@Override
-	public List<JavaClassLoader> getJavaClassLoaders() {		
+	public List<JVMClassLoader> getJavaClassLoaders() {		
 		return model.getJavaClassLoader();
 	}
 
@@ -81,23 +81,23 @@
 	}
 
 	@Override
-	public JavaVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
+	public JVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
 			CorruptDataException {
 		throw new DataUnavailable();
 	}
 
 	@Override
-	public List<JavaMonitor> getMonitors() {		
+	public List<JVMMonitor> getMonitors() {		
 		return model.getJavaMonitors();
 	}
 
 	@Override
-	public JavaObject getObjectAtAddress(ImagePointer pointer)
+	public JVMObject getObjectAtAddress(ImagePointer pointer)
 			throws CorruptDataException, IllegalArgumentException,
 			MemoryAccessException, DataUnavailable {
 		CLogger.logr.log(Level.FINEST,"Ask for object at"+pointer.getAddress());
 		
-		JavaObject obj =  model.getObjectAtAddress(pointer.getAddress());
+		JVMObject obj =  model.getObjectAtAddress(pointer.getAddress());
 		
 		if (obj == null) {
 			throw new IllegalArgumentException("Unable to retrieve an object at 0x"+
@@ -108,7 +108,7 @@
 	}
 
 	@Override
-	public List<JavaThread> getThreads() {		
+	public List<JVMThread> getThreads() {		
 		return model.getThreads();
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java Wed Oct 21 10:29:55 2009
@@ -19,11 +19,11 @@
 
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
-public class JClass implements JavaClass {
+public class JClass implements JVMClass {
 	/**
 	 * 
 	 */
@@ -59,7 +59,7 @@
 	public int locIn; // remove this
 
 	@Override
-	public JavaClassLoader getClassLoader() throws CorruptDataException {
+	public JVMClassLoader getClassLoader() throws CorruptDataException {
 		return classloader;
 	}
 
@@ -80,7 +80,7 @@
 	}
 
 	@Override
-	public JavaClass getComponentType() throws CorruptDataException {
+	public JVMClass getComponentType() throws CorruptDataException {
 		// TODO Auto-generated method stub
 		return null;
 	}
@@ -144,7 +144,7 @@
 	}
 
 	@Override
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		// TODO Auto-generated method stub
 		return null;
 	}
@@ -155,7 +155,7 @@
 	}
 
 	@Override
-	public JavaClass getSuperclass() throws CorruptDataException {
+	public JVMClass getSuperclass() throws CorruptDataException {
 		return superclass;
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java Wed Oct 21 10:29:55 2009
@@ -18,42 +18,42 @@
 import java.util.List;
 
 import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
-public class JClassLoader implements JavaClassLoader {
+public class JClassLoader implements JVMClassLoader {
 
-	private List<JavaClass> classes=null;
+	private List<JVMClass> classes=null;
 	public JObject obj = null;
 	
 	@Override
-	public JavaClass findClass(String name) throws CorruptDataException {
-		for (JavaClass c: classes){
+	public JVMClass findClass(String name) throws CorruptDataException {
+		for (JVMClass c: classes){
 			if (c.getName().equals(name))return c;
 		}
 		return null;
 	}
 
 	public void addClass(JClass c) {
-		if(classes==null) classes=new LinkedList<JavaClass>();
+		if(classes==null) classes=new LinkedList<JVMClass>();
 		classes.add(c);
 		c.classloader = this;
 	}
 
 	@Override
-	public List<JavaClass> getCachedClasses() {
-		return new EmptyList<JavaClass>();
+	public List<JVMClass> getCachedClasses() {
+		return new EmptyList<JVMClass>();
 	}
 
 	@Override
-	public List<JavaClass> getDefinedClasses() {
-		if(classes==null) classes=new LinkedList<JavaClass>();
+	public List<JVMClass> getDefinedClasses() {
+		if(classes==null) classes=new LinkedList<JVMClass>();
 		return classes;
 	}
 
 	@Override
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		return obj;
 	}
 	

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java Wed Oct 21 10:29:55 2009
@@ -19,13 +19,13 @@
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.MemoryAccessException;
-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.jvmti.reader.CLogger;
 
-public class JField implements JavaField, JValueHolder {
+public class JField implements JVMField, JValueHolder {
 
 	private JClass clazzid = null;
 	private long id = 0;
@@ -49,7 +49,7 @@
 	}
 
 	@Override
-	public Object get(JavaObject arg0) throws CorruptDataException,
+	public Object get(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		if (staticValue != null) {
 			return staticValue;
@@ -64,7 +64,7 @@
 	}
 
 	@Override
-	public boolean getBoolean(JavaObject arg0) throws CorruptDataException,
+	public boolean getBoolean(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		if (staticValue != null) {
 			return (Boolean) staticValue;
@@ -74,7 +74,7 @@
 	}
 
 	@Override
-	public byte getByte(JavaObject arg0) throws CorruptDataException,
+	public byte getByte(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		if (staticValue != null) {
 			return (Byte) staticValue;
@@ -84,7 +84,7 @@
 	}
 
 	@Override
-	public char getChar(JavaObject arg0) throws CorruptDataException,
+	public char getChar(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		if (staticValue != null) {
 			return (Character) staticValue;
@@ -94,7 +94,7 @@
 	}
 
 	@Override
-	public double getDouble(JavaObject arg0) throws CorruptDataException,
+	public double getDouble(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		if (staticValue != null) {
 			return (Double) staticValue;
@@ -104,7 +104,7 @@
 	}
 
 	@Override
-	public float getFloat(JavaObject arg0) throws CorruptDataException,
+	public float getFloat(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		if (staticValue != null) {
 			return (Float) staticValue;
@@ -114,7 +114,7 @@
 	}
 
 	@Override
-	public int getInt(JavaObject arg0) throws CorruptDataException,
+	public int getInt(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		if (staticValue != null) {
 			return (Integer) staticValue;
@@ -124,7 +124,7 @@
 	}
 
 	@Override
-	public long getLong(JavaObject arg0) throws CorruptDataException,
+	public long getLong(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		if (staticValue != null) {
 			return (Long) staticValue;
@@ -134,7 +134,7 @@
 	}
 
 	@Override
-	public short getShort(JavaObject arg0) throws CorruptDataException,
+	public short getShort(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		if (staticValue != null) {
 			return (Short) staticValue;
@@ -144,14 +144,14 @@
 	}
 
 	@Override
-	public String getString(JavaObject arg0) throws CorruptDataException,
+	public String getString(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		// Manually look for the string class
 		
 		// First check static value
 		if (staticValue != null) {
 			JObject stringObj = (JObject) staticValue;
-			JavaClass stringClass = stringObj.getJavaClass();
+			JVMClass stringClass = stringObj.getJavaClass();
 			while (!stringClass.getName().equals("java/lang/String")) {
 				if ((stringClass = stringClass.getSuperclass()) == null) {
 					break;
@@ -159,7 +159,7 @@
 			}
 
 			if (stringClass != null) {
-				for (JavaField field : stringObj.getJavaClass()
+				for (JVMField field : stringObj.getJavaClass()
 						.getDeclaredFields()) {
 					// Assume this is the correct field
 					if (field.getSignature().equals("[C")) {
@@ -180,8 +180,8 @@
 		
 		if (arg0 != null) {
 			JObject obj = (JObject)arg0;
-			JavaObject stringObj = (JavaObject)obj.getValue(id);
-			JavaClass stringClass = stringObj.getJavaClass();
+			JVMObject stringObj = (JVMObject)obj.getValue(id);
+			JVMClass stringClass = stringObj.getJavaClass();
 			while (!stringClass.getName().equals("java/lang/String")) {
 				if ((stringClass = stringClass.getSuperclass()) == null) {
 					break;
@@ -189,7 +189,7 @@
 			}
 			
 			if (stringClass != null) {
-				for (JavaField field : stringObj.getJavaClass()
+				for (JVMField field : stringObj.getJavaClass()
 						.getDeclaredFields()) {
 					// Assume this is the correct field
 					if (field.getSignature().equals("[C")) {
@@ -208,7 +208,7 @@
 	}
 
 	@Override
-	public JavaClass getDeclaringClass() throws CorruptDataException,
+	public JVMClass getDeclaringClass() throws CorruptDataException,
 			DataUnavailable {
 
 		return clazzid;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JHeap.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JHeap.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JHeap.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JHeap.java Wed Oct 21 10:29:55 2009
@@ -16,15 +16,15 @@
 import java.util.List;
 
 import javax.tools.diagnostics.image.ImageSection;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 /**
  * Makes available all of the objects in the heap 
  * by extracting their List from the Model. 
  *
  */
-public class JHeap implements JavaHeap {
+public class JHeap implements JVMHeap {
 	private static final String HEAP_NAME="Object Heap";	
 	
 	private Model model;
@@ -42,7 +42,7 @@
 	}
 
 	@Override
-	public List<JavaObject> getObjects() {
+	public List<JVMObject> getObjects() {
 		return model.getObjects();
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java Wed Oct 21 10:29:55 2009
@@ -15,9 +15,9 @@
 package org.apache.kato.jvmti.javaruntime.model;
 
 import javax.tools.diagnostics.image.DataUnavailable;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
-public class JLocalVariable implements JValueHolder,JavaVariable{
+public class JLocalVariable implements JValueHolder,JVMVariable{
 
 	public Object value=null;
 	public int slot=0;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java Wed Oct 21 10:29:55 2009
@@ -15,9 +15,9 @@
 package org.apache.kato.jvmti.javaruntime.model;
 
 import javax.tools.diagnostics.image.DataUnavailable;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
-public class JLocalVariableTableEntry implements JavaVariable  {
+public class JLocalVariableTableEntry implements JVMVariable  {
 
 	public String gensig;
 	public String sig;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java Wed Oct 21 10:29:55 2009
@@ -17,10 +17,10 @@
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
 
-public class JLocation implements JavaLocation {
+public class JLocation implements JVMLocation {
 	public JMethod method=null;
 	public String filename=null;
 	public int linenumber=0;
@@ -56,7 +56,7 @@
 	}
 
 	@Override
-	public JavaMethod getMethod() throws CorruptDataException {
+	public JVMMethod getMethod() throws CorruptDataException {
 		return method;
 	}
 	

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java Wed Oct 21 10:29:55 2009
@@ -25,12 +25,12 @@
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImageSection;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
 
 import org.apache.kato.jvmti.reader.CLogger;
 
-public class JMethod implements JavaMethod {
+public class JMethod implements JVMMethod {
 
 	private int argumentsize;
 	public int maxlocals;
@@ -91,7 +91,7 @@
 	}
 
 	@Override
-	public JavaClass getDeclaringClass() throws CorruptDataException,
+	public JVMClass getDeclaringClass() throws CorruptDataException,
 			DataUnavailable {		
 		return parent;
 	}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java Wed Oct 21 10:29:55 2009
@@ -19,11 +19,11 @@
 
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMThread;
 
-public class JMonitor implements JavaMonitor {
+public class JMonitor implements JVMMonitor {
 	private Model model;
 	private long owner=0;
 	private long monitorObject=0;
@@ -36,8 +36,8 @@
 	}
 
 	@Override
-	public List<JavaThread> getEnterWaiters() {
-		List<JavaThread> waitingThreads= new LinkedList<JavaThread>();
+	public List<JVMThread> getEnterWaiters() {
+		List<JVMThread> waitingThreads= new LinkedList<JVMThread>();
 		for (Long l: waiters){
 			waitingThreads.add(model.getThread(l));
 		}
@@ -60,8 +60,8 @@
 	}
 
 	@Override
-	public List<JavaThread> getNotifyWaiters() {
-		List<JavaThread> waitingThreads= new LinkedList<JavaThread>();
+	public List<JVMThread> getNotifyWaiters() {
+		List<JVMThread> waitingThreads= new LinkedList<JVMThread>();
 		for (Long l: waiters){
 			waitingThreads.add(model.getThread(l));
 		}
@@ -69,12 +69,12 @@
 	}
 
 	@Override
-	public JavaObject getObject() {
+	public JVMObject getObject() {
 		return model.getObjectAtAddress(getMonitorObject());
 	}
 
 	@Override
-	public JavaThread getOwner() throws CorruptDataException {
+	public JVMThread getOwner() throws CorruptDataException {
 		return model.getThread(owner);
 	}
 	

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java Wed Oct 21 10:29:55 2009
@@ -24,10 +24,10 @@
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.ImageSection;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaReference;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMReference;
 
 import org.apache.kato.jvmti.reader.CLogger;
 
@@ -35,7 +35,7 @@
  * Represents a Java object.
  * 
  */
-public class JObject implements JavaObject {
+public class JObject implements JVMObject {
 
 	private long objid = 0;
 	private long size = 0;
@@ -265,7 +265,7 @@
 			CLogger.logr.log(Level.FINEST,"...Object array");
 			JObject[] ca = (JObject[]) objArray;
 			int index = 0;
-			JavaObject[] outArray = (JavaObject[]) dst;
+			JVMObject[] outArray = (JVMObject[]) dst;
 			for (int i = srcStart; i < srcStart + length; i++) {
 				outArray[index] = ca[i];
 				index++;
@@ -284,7 +284,7 @@
 	}
 
 	@Override
-	public JavaHeap getHeap() throws CorruptDataException, DataUnavailable {
+	public JVMHeap getHeap() throws CorruptDataException, DataUnavailable {
 		return model.getHeap();
 	}
 
@@ -294,7 +294,7 @@
 	}
 
 	@Override
-	public JavaClass getJavaClass() throws CorruptDataException {
+	public JVMClass getJavaClass() throws CorruptDataException {
 
 		CLogger.logr.log(Level.FINEST,"asking for class " + clazz);
 		return clazz;
@@ -307,8 +307,8 @@
 	}
 
 	@Override
-	public List<JavaReference> getReferences() {
-		return new EmptyList<JavaReference>();
+	public List<JVMReference> getReferences() {
+		return new EmptyList<JVMReference>();
 	}
 
 	@Override

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java Wed Oct 21 10:29:55 2009
@@ -20,18 +20,18 @@
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaReference;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMReference;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
 import org.apache.kato.jvmti.reader.CLogger;
 
-public class JStackFrame implements JavaStackFrame {
+public class JStackFrame implements JVMStackFrame {
 	private static int stackFrameIDCount = 1;
 	private JLocation location=null;
 	private int stackFrameID;
-	private ObjectMapList<Integer,JavaVariable> vars=new ObjectMapList<Integer, JavaVariable>();
+	private ObjectMapList<Integer,JVMVariable> vars=new ObjectMapList<Integer, JVMVariable>();
 	
 	
 	public JStackFrame(){
@@ -48,12 +48,12 @@
 		this.location=loc;
 	}
 	@Override
-	public List<JavaReference> getHeapRoots() {
-		return new EmptyList<JavaReference>();
+	public List<JVMReference> getHeapRoots() {
+		return new EmptyList<JVMReference>();
 	}
 
 	@Override
-	public JavaLocation getLocation() throws CorruptDataException {
+	public JVMLocation getLocation() throws CorruptDataException {
 		
 			return location;
 	}
@@ -65,7 +65,7 @@
 			CLogger.logr.log(Level.FINEST,"Null variables "+slot);
 			return null;
 		}// TODO Correct this, behaviour is inconsistent
-		JavaVariable jv =vars.get(slot);
+		JVMVariable jv =vars.get(slot);
 		if (jv == null) {
 			CLogger.logr.log(Level.FINEST,"Null variables in "+slot);
 			return null;
@@ -82,7 +82,7 @@
 	}
 
 	@Override
-	public List<JavaVariable> getVariables() {
+	public List<JVMVariable> getVariables() {
 		
 		return vars.values();
 	}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java Wed Oct 21 10:29:55 2009
@@ -24,15 +24,15 @@
 import javax.tools.diagnostics.image.ImageSection;
 import javax.tools.diagnostics.image.ImageThread;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-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.JVMHeap;
+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.jvmti.reader.CLogger;
 
-public class JThread implements JavaThread{
+public class JThread implements JVMThread{
 	public JMonitor contendedMonitor=null;
 	public long id=0;
 	public short priority=0;
@@ -41,7 +41,7 @@
 	public String threadName=null;
 	
 
-	private List<JavaStackFrame> frames=new LinkedList<JavaStackFrame>();
+	private List<JVMStackFrame> frames=new LinkedList<JVMStackFrame>();
 	
 	
 	public JThread(long id) {
@@ -70,9 +70,9 @@
 		return threadName;
 	}
 	@Override
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		
-		return new JavaObject(){
+		return new JVMObject(){
 
 			@Override
 			public void arraycopy(int srcStart, Object dst, int dstStart,
@@ -96,7 +96,7 @@
 			}
 
 			@Override
-			public JavaHeap getHeap() throws CorruptDataException,
+			public JVMHeap getHeap() throws CorruptDataException,
 					DataUnavailable {
 				// TODO Auto-generated method stub
 				return null;
@@ -108,7 +108,7 @@
 			}
 
 			@Override
-			public JavaClass getJavaClass() throws CorruptDataException {
+			public JVMClass getJavaClass() throws CorruptDataException {
 				// TODO Auto-generated method stub
 				return null;
 			}
@@ -153,7 +153,7 @@
 	}
 	
 	@Override
-	public List<JavaStackFrame> getStackFrames() {
+	public List<JVMStackFrame> getStackFrames() {
 		CLogger.logr.log(Level.FINEST,"Asked for stack frames");
 		return frames;
 	}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java Wed Oct 21 10:29:55 2009
@@ -19,22 +19,22 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMThread;
 
 public class Model {
 
-	private ObjectMapList<Long,JavaThread> threadMap=new ObjectMapList<Long,JavaThread>();
-	Map<Long,JavaClass>  classMap=new HashMap<Long,JavaClass>();
-	private ObjectMapList<Long,JavaClassLoader> loadersMap=new ObjectMapList<Long,JavaClassLoader>();
-	private ObjectMapList<Long,JavaMonitor> monitorsMap=new ObjectMapList<Long,JavaMonitor>();
-	private ObjectMapList<Long,JavaMethod>  methodMap=new ObjectMapList<Long,JavaMethod>();
-	private ObjectMapList<Long,JavaObject>  objectMap=new ObjectMapList<Long,JavaObject>();
+	private ObjectMapList<Long,JVMThread> threadMap=new ObjectMapList<Long,JVMThread>();
+	Map<Long,JVMClass>  classMap=new HashMap<Long,JVMClass>();
+	private ObjectMapList<Long,JVMClassLoader> loadersMap=new ObjectMapList<Long,JVMClassLoader>();
+	private ObjectMapList<Long,JVMMonitor> monitorsMap=new ObjectMapList<Long,JVMMonitor>();
+	private ObjectMapList<Long,JVMMethod>  methodMap=new ObjectMapList<Long,JVMMethod>();
+	private ObjectMapList<Long,JVMObject>  objectMap=new ObjectMapList<Long,JVMObject>();
 
 	public JClass getClass(long id) {
 		if(id==0) return null;
@@ -47,7 +47,7 @@
 		return m;
 	}
 
-	public JavaObject getObjectAtAddress(long loc){
+	public JVMObject getObjectAtAddress(long loc){
 		return objectMap.get(loc);
 	}
 
@@ -105,13 +105,13 @@
 		}
 		return monitor;
 	}
-	public List<JavaThread> getThreads() {
+	public List<JVMThread> getThreads() {
 		return threadMap.values();
 	}
-	public List<JavaClassLoader> getJavaClassLoader() {
+	public List<JVMClassLoader> getJavaClassLoader() {
 		return loadersMap.values();
 	}
-	public List<JavaMonitor> getJavaMonitors() {
+	public List<JVMMonitor> getJavaMonitors() {
 		return monitorsMap.values();
 	}
 	
@@ -129,7 +129,7 @@
 	 *  
 	 * @return an unmodifiable list of objects.
 	 */
-	public List<JavaObject> getObjects() {
+	public List<JVMObject> getObjects() {
 		return Collections.unmodifiableList(objectMap.values());		
 	}
 
@@ -140,7 +140,7 @@
 	 * 
 	 * @return JHeap instance
 	 */
-	public JavaHeap getHeap() {
+	public JVMHeap getHeap() {
 		if (heap == null) {
 			heap = new JHeap(this);
 		}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java Wed Oct 21 10:29:55 2009
@@ -22,7 +22,7 @@
 import javax.tools.diagnostics.image.ImageFactory;
 import javax.tools.diagnostics.image.ImageProcess;
 import javax.tools.diagnostics.runtime.ManagedRuntime;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 public class ImageFactoryImpl implements ImageFactory{
 
@@ -62,14 +62,14 @@
 	}
 
 	@Override
-	public JavaRuntime getJavaRuntime(File file) throws IOException {
+	public JVMRuntime getJavaRuntime(File file) throws IOException {
 		 Image i=getImage(file);
 		 if(i==null) return null;
 		 
 		for(ImageAddressSpace space:i.getAddressSpaces()) {
 			ImageProcess process=space.getCurrentProcess();
 			for(ManagedRuntime r : process.getRuntimes()) {
-				if(r instanceof JavaRuntime) return (JavaRuntime) r;
+				if(r instanceof JVMRuntime) return (JVMRuntime) r;
 			}
 		}
 		return null;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java Wed Oct 21 10:29:55 2009
@@ -30,9 +30,9 @@
 import javax.imageio.stream.FileImageInputStream;
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaThread;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMThread;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
 import org.apache.kato.jvmti.javaruntime.model.DeferredReference;
 import org.apache.kato.jvmti.javaruntime.model.JClass;
@@ -151,13 +151,13 @@
 		log.log(Level.FINER, "");
 		log.log(Level.FINER, "");
 		cjvmEx.toString();
-		List<JavaThread> jthreads = cjvm.getModel().getThreads();
+		List<JVMThread> jthreads = cjvm.getModel().getThreads();
 
-		for (JavaThread t : jthreads) {
+		for (JVMThread t : jthreads) {
 			try {
 				log.log(Level.FINEST, t.getName());
-				for (JavaStackFrame jsf : t.getStackFrames()) {
-					for (JavaVariable jv : jsf.getVariables()) {
+				for (JVMStackFrame jsf : t.getStackFrames()) {
+					for (JVMVariable jv : jsf.getVariables()) {
 
 						try {
 							log.log(Level.FINEST, "" + jv.getName() + " "

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/image/ImageFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/image/ImageFactoryImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/image/ImageFactoryImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/image/ImageFactoryImpl.java Wed Oct 21 10:29:55 2009
@@ -21,7 +21,7 @@
 import javax.tools.diagnostics.image.ImageFactory;
 import javax.tools.diagnostics.image.ImageProcess;
 import javax.tools.diagnostics.runtime.ManagedRuntime;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 import org.apache.kato.hprof.datalayer.HProfFactory;
 import org.apache.kato.hprof.datalayer.HProfFile;
@@ -71,14 +71,14 @@
 		return suffixes;
 	}
 	@Override
-	public JavaRuntime getJavaRuntime(File file) throws IOException {
+	public JVMRuntime getJavaRuntime(File file) throws IOException {
 		 Image i=getImage(file);
 		 if(i==null) return null;
 		 
 		for(ImageAddressSpace space:i.getAddressSpaces()) {
 			ImageProcess process=space.getCurrentProcess();
 			for(ManagedRuntime r : process.getRuntimes()) {
-				if(r instanceof JavaRuntime) return (JavaRuntime) r;
+				if(r instanceof JVMRuntime) return (JVMRuntime) r;
 			}
 		}
 		return null;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/IJavaHeapInternal.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/IJavaHeapInternal.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/IJavaHeapInternal.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/IJavaHeapInternal.java Wed Oct 21 10:29:55 2009
@@ -16,9 +16,9 @@
 import java.util.Collection;
 
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 
 /**
@@ -27,13 +27,13 @@
  * 
  *
  */
-public interface IJavaHeapInternal extends JavaHeap {
+public interface IJavaHeapInternal extends JVMHeap {
 
-	abstract JavaObject getObjectByID(Long element);
+	abstract JVMObject getObjectByID(Long element);
 
 	abstract JavaClassImpl getJavaClassByID(long arrayClassObjectID);
 
-	abstract JavaClass getPrimitiveArrayClass(short elementType);
+	abstract JVMClass getPrimitiveArrayClass(short elementType);
 
 	abstract String getUTF8StringByID(long fieldNameID);
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassImpl.java Wed Oct 21 10:29:55 2009
@@ -22,10 +22,10 @@
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-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.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.common.BasicType;
 import org.apache.kato.hprof.IJavaClass;
@@ -41,7 +41,7 @@
  *  
  *
  */
-public class JavaClassImpl implements JavaClass {
+public class JavaClassImpl implements JVMClass {
 	IJavaHeapInternal heap;
 	IJavaClass javaClass;
 	
@@ -49,7 +49,7 @@
 	 * Superclass to static and instance fields.
 	 *
 	 */
-	abstract class JavaFieldImpl implements JavaField {
+	abstract class JavaFieldImpl implements JVMField {
 		FieldEntry field;
 
 		/**
@@ -94,14 +94,14 @@
 		}
 		
 		@Override
-		public JavaClass getDeclaringClass() throws CorruptDataException,
+		public JVMClass getDeclaringClass() throws CorruptDataException,
 				DataUnavailable {
 					return JavaClassImpl.this;
 				}
 		
-		String getStringFromJavaObject(JavaObject obj) throws CorruptDataException, MemoryAccessException {
-			JavaClass clazz = obj.getJavaClass();
-			JavaObject value=null;
+		String getStringFromJavaObject(JVMObject obj) throws CorruptDataException, MemoryAccessException {
+			JVMClass clazz = obj.getJavaClass();
+			JVMObject value=null;
 			int offset=0;
 			int count=0;
 			boolean valueSet = false, offsetSet = false, countSet=false;
@@ -109,10 +109,10 @@
 			Iterator iter = clazz.getDeclaredFields().iterator();
 			
 			while (iter.hasNext()) {
-				JavaField field = (JavaField) iter.next();
+				JVMField field = (JVMField) iter.next();
 				String name = field.getName();
 				if("value".equals(name)) {
-					value = (JavaObject) field.get(obj);
+					value = (JVMObject) field.get(obj);
 					valueSet = true;
 				} else if ("offset".equals(name)) {
 					offset = field.getInt(obj);
@@ -183,7 +183,7 @@
 		}
 		
 		@Override
-		public Object get(JavaObject obj) throws CorruptDataException,
+		public Object get(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			
 			if (! (obj instanceof JavaObjectInstanceImpl)) {
@@ -231,7 +231,7 @@
 		}
 
 		@Override
-		public boolean getBoolean(JavaObject obj) throws CorruptDataException,
+		public boolean getBoolean(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			JavaObjectInstanceImpl instance = ((JavaObjectInstanceImpl) obj);
 			JavaClassImpl clazz = (JavaClassImpl) obj.getJavaClass();
@@ -241,7 +241,7 @@
 		}
 
 		@Override
-		public byte getByte(JavaObject obj) throws CorruptDataException,
+		public byte getByte(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			JavaObjectInstanceImpl instance = ((JavaObjectInstanceImpl) obj);
 			JavaClassImpl clazz = (JavaClassImpl) obj.getJavaClass();
@@ -251,7 +251,7 @@
 		}
 
 		@Override
-		public char getChar(JavaObject obj) throws CorruptDataException,
+		public char getChar(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			JavaObjectInstanceImpl instance = ((JavaObjectInstanceImpl) obj);
 			JavaClassImpl clazz = (JavaClassImpl) obj.getJavaClass();
@@ -261,7 +261,7 @@
 		}
 
 		@Override
-		public double getDouble(JavaObject obj) throws CorruptDataException,
+		public double getDouble(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			JavaObjectInstanceImpl instance = ((JavaObjectInstanceImpl) obj);
 			JavaClassImpl clazz = (JavaClassImpl) obj.getJavaClass();
@@ -271,7 +271,7 @@
 		}
 
 		@Override
-		public float getFloat(JavaObject obj) throws CorruptDataException,
+		public float getFloat(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			JavaObjectInstanceImpl instance = ((JavaObjectInstanceImpl) obj);
 			JavaClassImpl clazz = (JavaClassImpl) obj.getJavaClass();
@@ -282,7 +282,7 @@
 		}
 
 		@Override
-		public int getInt(JavaObject obj) throws CorruptDataException,
+		public int getInt(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			JavaObjectInstanceImpl instance = ((JavaObjectInstanceImpl) obj);
 			JavaClassImpl clazz = (JavaClassImpl) obj.getJavaClass();
@@ -293,7 +293,7 @@
 		}
 
 		@Override
-		public long getLong(JavaObject obj) throws CorruptDataException,
+		public long getLong(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			JavaObjectInstanceImpl instance = ((JavaObjectInstanceImpl) obj);
 			JavaClassImpl clazz = (JavaClassImpl) obj.getJavaClass();
@@ -304,7 +304,7 @@
 		}
 
 		@Override
-		public short getShort(JavaObject obj) throws CorruptDataException,
+		public short getShort(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			JavaObjectInstanceImpl instance = ((JavaObjectInstanceImpl) obj);
 			JavaClassImpl clazz = (JavaClassImpl) obj.getJavaClass();
@@ -314,16 +314,16 @@
 		}
 
 		@Override
-		public String getString(JavaObject obj) throws CorruptDataException,
+		public String getString(JVMObject obj) throws CorruptDataException,
 				MemoryAccessException {
 			Object fieldObj = get(obj);
 			if (fieldObj == null) {
 				return null;
 			}
-			if (!(fieldObj instanceof JavaObject)) {
+			if (!(fieldObj instanceof JVMObject)) {
 				throw new IllegalArgumentException("Field "+getName()+" not an object");
 			}
-			JavaObject jObject = (JavaObject) fieldObj;
+			JVMObject jObject = (JVMObject) fieldObj;
 			
 			if (! "java/lang/String".equals( jObject.getJavaClass().getName() )) {
 				throw new IllegalArgumentException("Field "+getName()+" refers to 0x"+
@@ -358,7 +358,7 @@
 		 * boxed. Other types are implementations of JavaObject, or null.
 		 */
 		@Override
-		public Object get(JavaObject arg0) throws CorruptDataException,
+		public Object get(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			StaticFieldEntry field = (StaticFieldEntry) this.field;
 			
@@ -388,55 +388,55 @@
 		}
 
 		@Override
-		public boolean getBoolean(JavaObject arg0) throws CorruptDataException,
+		public boolean getBoolean(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			return ((StaticFieldEntry)field).getBooleanField();
 		}
 
 		@Override
-		public byte getByte(JavaObject arg0) throws CorruptDataException,
+		public byte getByte(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			return ((StaticFieldEntry)field).getByteField();
 		}
 
 		@Override
-		public char getChar(JavaObject arg0) throws CorruptDataException,
+		public char getChar(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			return ((StaticFieldEntry)field).getCharField();
 		}
 
 		@Override
-		public double getDouble(JavaObject arg0) throws CorruptDataException,
+		public double getDouble(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			return ((StaticFieldEntry)field).getDoubleField();
 		}
 
 		@Override
-		public float getFloat(JavaObject arg0) throws CorruptDataException,
+		public float getFloat(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			return ((StaticFieldEntry)field).getFloatField();
 		}
 
 		@Override
-		public int getInt(JavaObject arg0) throws CorruptDataException,
+		public int getInt(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			return ((StaticFieldEntry)field).getIntegerField();
 		}
 
 		@Override
-		public long getLong(JavaObject arg0) throws CorruptDataException,
+		public long getLong(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			return ((StaticFieldEntry)field).getLongField();
 		}
 
 		@Override
-		public short getShort(JavaObject arg0) throws CorruptDataException,
+		public short getShort(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			return ((StaticFieldEntry)field).getShortField();
 		}
 
 		@Override
-		public String getString(JavaObject arg0) throws CorruptDataException,
+		public String getString(JVMObject arg0) throws CorruptDataException,
 				MemoryAccessException {
 			
 			return getStringFromJavaObject(heap.getObjectByID(((StaticFieldEntry)field).getIDField()));
@@ -457,7 +457,7 @@
 	}
 	
 	@Override
-	public JavaClassLoader getClassLoader() throws CorruptDataException {
+	public JVMClassLoader getClassLoader() throws CorruptDataException {
 		return heap.getJavaClassLoaderByID(javaClass.getClassLoaderObjectID());
 	}
 
@@ -474,7 +474,7 @@
 	 * array class belongs to. 
 	 */
 	@Override
-	public JavaClass getComponentType() throws CorruptDataException {
+	public JVMClass getComponentType() throws CorruptDataException {
 		if (!isArray()) {
 			throw new IllegalArgumentException("Class is not an array type");
 		}
@@ -530,14 +530,14 @@
 	 * The static and instance fields belonging to this class.
 	 * 
 	 */
-	private ArrayList<JavaField> fields;
+	private ArrayList<JVMField> fields;
 	@Override
 	public List getDeclaredFields() {
 		if (fields == null) {
 			StaticFieldEntry staticFields[] = javaClass.getStaticFields();
 			InstanceFieldEntry instanceFields[] = javaClass.getInstanceFields();
 			
-			fields = new ArrayList<JavaField>(staticFields.length + instanceFields.length);
+			fields = new ArrayList<JVMField>(staticFields.length + instanceFields.length);
 			
 			for (StaticFieldEntry f : staticFields) {
 				fields.add(new StaticFieldImpl(f));
@@ -650,7 +650,7 @@
 	 * by the class records. 
 	 */
 	@Override
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		return null;
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassLoaderImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassLoaderImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassLoaderImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaClassLoaderImpl.java Wed Oct 21 10:29:55 2009
@@ -19,8 +19,8 @@
 import java.util.List;
 
 import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.common.IteratorBackedList;
 import org.apache.kato.hprof.IJavaClassLoader;
@@ -31,7 +31,7 @@
  * 
  *
  */
-public class JavaClassLoaderImpl implements JavaClassLoader {
+public class JavaClassLoaderImpl implements JVMClassLoader {
 	IJavaClassLoader loader;
 	IJavaHeapInternal heap;
 	
@@ -125,7 +125,7 @@
 	 * 
 	 */
 	@Override
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		return heap.getObjectByID(this.loader.getID());
 	}
 



Mime
View raw message