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:36:51 UTC

svn commit: r827955 - in /incubator/kato/branches/experimental/thirdview/org.apache.kato: kato.api/src/main/java/javax/tools/diagnostics/runtime/java/ kato.native/kato.native.cjvmti/

Author: spoole
Date: Wed Oct 21 10:36:50 2009
New Revision: 827955

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

Added:
    incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMClass.java
      - copied, changed from r827910, 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/JVMClassLoader.java
      - copied, changed from r827910, 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/JVMField.java
      - copied, changed from r827910, 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/JVMHeap.java
      - copied, changed from r827910, 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/JVMInitArgs.java
      - copied, changed from r827910, 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/JVMLocation.java
      - copied, changed from r827910, 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/JVMMember.java
      - copied, changed from r827910, 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/JVMMethod.java
      - copied, changed from r827910, 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/JVMMonitor.java
      - copied, changed from r827910, 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/JVMObject.java
      - copied, changed from r827910, 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/JVMOption.java
      - copied, changed from r827910, 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/JVMReference.java
      - copied, changed from r827910, 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/JVMRuntime.java
      - copied, changed from r827910, 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/JVMStackFrame.java
      - copied, changed from r827910, 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/JVMThread.java
      - copied, changed from r827910, 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/JVMVariable.java
      - copied, changed from r827910, 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.native/kato.native.cjvmti/   (props changed)

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMClass.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaClass.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMClass.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMClass.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaClass.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaClass.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMClass.java Wed Oct 21 10:36:50 2009
@@ -28,7 +28,7 @@
  * or special types such as array types or primitive types in the Java Virtual Machine.  
  * 
  */
-public interface JavaClass {
+public interface JVMClass {
 
     /**
      * <p>
@@ -42,7 +42,7 @@
      * 
      * @see #getID()
      */
-    JavaObject getObject() throws CorruptDataException; 
+    JVMObject getObject() throws CorruptDataException; 
 
     /**
      * Fetch the class loader associated with this class. Classes defined in
@@ -56,7 +56,7 @@
      * 
      * @return the JavaClassLoader in which this class was defined
      */
-    JavaClassLoader getClassLoader() throws CorruptDataException;
+    JVMClassLoader getClassLoader() throws CorruptDataException;
     
     /**
      * <p>Get the name of the class in a form that follows the {@link java.lang.Class#getName()} definition.</p>
@@ -81,7 +81,7 @@
      * 
      * @throws CorruptDataException if the underlying data is in an unexpected state
      */
-    JavaClass getSuperclass() throws CorruptDataException;
+    JVMClass getSuperclass() throws CorruptDataException;
     
     
     /**
@@ -93,7 +93,7 @@
      * @return a list  of the names of interfaces directly implemented by this class. 
      * 
      * @see java.lang.String
-     * @see JavaClassLoader#findClass(String)
+     * @see JVMClassLoader#findClass(String)
      * @see javax.tools.diagnostics.image.CorruptData
      */
     List<String> getInterfaces();
@@ -130,7 +130,7 @@
      * 
      * @throws java.lang.IllegalArgumentException if this JavaClass does not represent an array class
      */
-    JavaClass getComponentType() throws CorruptDataException;
+    JVMClass getComponentType() throws CorruptDataException;
     
     /**
      * <p>Get the set of fields declared in this class.</p>
@@ -140,10 +140,10 @@
      * 
      * @return a list of fields declared in this class. 
      * 
-     * @see JavaField
+     * @see JVMField
      * @see javax.tools.diagnostics.image.CorruptData
      */
-    List<JavaField> getDeclaredFields();
+    List<JVMField> getDeclaredFields();
     
     /**
      * <p>Get the set of methods declared in this class.</p>
@@ -153,10 +153,10 @@
  
      * @return a list of methods declared in this class.
      * 
-     * @see JavaMethod
+     * @see JVMMethod
      * @see javax.tools.diagnostics.image.CorruptData
      */
-    List<JavaMethod> getDeclaredMethods();
+    List<JVMMethod> getDeclaredMethods();
     
     /**
      * <p>
@@ -188,10 +188,10 @@
      * 
      * @return a list of JavaObjects which are referred to by the constant pool of this class.
      * 
-     * @see JavaObject
+     * @see JVMObject
      * @see javax.tools.diagnostics.image.CorruptData
      */
-    List<JavaObject> getConstantPoolReferences();
+    List<JVMObject> getConstantPoolReferences();
     
     /**
      * <p>
@@ -215,20 +215,20 @@
 	 * <p>
 	 * A reference is a object that represents the uni-directional relationship between objects and classes.
 	 * Objects and classes cannot be reclaimed by the Java Virtual Machine garbage collector if references exist
-	 * that can ultimately be traced back to root references.  see {@link JavaReference} for more detailed information.
+	 * that can ultimately be traced back to root references.  see {@link JVMReference} for more detailed information.
 	 * <p>
 	 * Since this API can present entities that exist at any point in their lifecycle, it is possible to encounter an
-	 * JavaClass that is eligible for collection and thus no {@link JavaReference} can be found that refers to it.
+	 * JavaClass that is eligible for collection and thus no {@link JVMReference} can be found that refers to it.
 	 *   
 	 * <p>The returned list follows the standard semantics for javax.tools.diagnostics collections.</p>
      * <p>The returned list is never null but could be empty.</p>
      * 
      * @return a list of JavaReferences
 	 *
-	 * @see javax.tools.diagnostics.runtime.java.JavaReference
+	 * @see javax.tools.diagnostics.runtime.java.JVMReference
 	 * @see javax.tools.diagnostics.image.CorruptData
 	 */
-	List<JavaReference> getReferences();
+	List<JVMReference> getReferences();
     
 	/**
 	 * @param obj

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMClassLoader.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaClassLoader.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMClassLoader.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMClassLoader.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaClassLoader.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaClassLoader.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMClassLoader.java Wed Oct 21 10:36:50 2009
@@ -43,21 +43,21 @@
  * 
  * @see java.lang.ClassLoader
  */
-public interface JavaClassLoader {
+public interface JVMClassLoader {
 
     /**
      * <p>
      * Get the set of classes which are defined in this JavaClassLoader.
-     * Calling the {@link JavaClass#getClassLoader()} method on objects  returned in this list will
+     * Calling the {@link JVMClass#getClassLoader()} method on objects  returned in this list will
      * return this JavaClassLoader</p>
      *    
      * <p>The returned list follows the standard semantics for javax.tools.diagnostics collections.</p>
      * <p>The returned value is never null but can be an empty list.</p>
      *   
      * @return an list of classes which are defined in this JavaClassLoader 
-     * @see JavaClass
+     * @see JVMClass
      */
-    List<JavaClass> getDefinedClasses();
+    List<JVMClass> getDefinedClasses();
     
     /**
      * <p>
@@ -74,9 +74,9 @@
      * @return a list of classes which are defined  in this JavaClassLoader 
      * <i>or</i> which were found by delegation to other JavaClassLoaders
      * 
-     * @see JavaClass
+     * @see JVMClass
      */
-    List<JavaClass> getCachedClasses();
+    List<JVMClass> getCachedClasses();
     
     /**
      * <p>
@@ -102,10 +102,10 @@
      * @return the JavaClass instance, or null if it is not found
      * @throws CorruptDataException if the underlying data is in an unexpected state
      */
-    JavaClass findClass(String name) throws CorruptDataException;
+    JVMClass findClass(String name) throws CorruptDataException;
     
     /**
-     * Get the {@link java.lang.ClassLoader} instance (represented by a {@link JavaObject} 
+     * Get the {@link java.lang.ClassLoader} instance (represented by a {@link JVMObject} 
      * associated with this class loader. If there is no associated class loader, for example the
      * system class loader , then  null will be returned.
      * 
@@ -115,10 +115,10 @@
      * 
      * @throws CorruptDataException if the underlying data is in an unexpected state
      * 
-     * @see JavaObject
+     * @see JVMObject
      * @see ClassLoader
      */
-    JavaObject getObject() throws CorruptDataException;
+    JVMObject getObject() throws CorruptDataException;
     
 	/**
 	 * @param obj

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMField.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaField.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMField.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMField.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaField.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaField.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMField.java Wed Oct 21 10:36:50 2009
@@ -21,7 +21,7 @@
  * Represents a field declaration.
  * It is modelled on {@link java.lang.reflect.Field}
  */
-public interface JavaField extends JavaMember {
+public interface JVMField extends JVMMember {
 
     /**
      * <p>
@@ -44,7 +44,7 @@
      * @throws IllegalArgumentException if the specified object is not appropriate for
      * this field
      *
-     * @see JavaObject
+     * @see JVMObject
      * @see Byte
      * @see Double
      * @see Float
@@ -54,7 +54,7 @@
      * @see Character
      * @see Boolean
      */
-    Object get(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    Object get(JVMObject object) throws CorruptDataException, MemoryAccessException;
 
     /**
      * <p>
@@ -67,7 +67,7 @@
      * @throws IllegalArgumentException if the specified object is not appropriate for
      * this field, or if the type of the field cannot be converted to boolean
      */
-    boolean getBoolean(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    boolean getBoolean(JVMObject object) throws CorruptDataException, MemoryAccessException;
 
     /**
      * <p>
@@ -80,7 +80,7 @@
      * @throws IllegalArgumentException if the specified object is not appropriate for
      * this field, or if the type of the field cannot be converted to byte
      */
-    byte getByte(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    byte getByte(JVMObject object) throws CorruptDataException, MemoryAccessException;
 
     /**
      * <p>
@@ -93,7 +93,7 @@
      * @throws IllegalArgumentException if the specified object is not appropriate for
      * this field, or if the type of the field cannot be converted to char
      */
-    char getChar(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    char getChar(JVMObject object) throws CorruptDataException, MemoryAccessException;
 
     /**
      * <p>
@@ -106,7 +106,7 @@
      * @throws IllegalArgumentException if the specified object is not appropriate for
      * this field, or if the type of the field cannot be converted to double via a widening conversion
      */
-    double getDouble(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    double getDouble(JVMObject object) throws CorruptDataException, MemoryAccessException;
 
     /**
      * <p>
@@ -119,7 +119,7 @@
      * @throws IllegalArgumentException if the specified object is not appropriate for
      * this field, or if the type of the field cannot be converted to float via a widening conversion
      */
-    float getFloat(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    float getFloat(JVMObject object) throws CorruptDataException, MemoryAccessException;
 
     /**
      * <p>
@@ -132,7 +132,7 @@
      * @throws IllegalArgumentException if the specified object is not appropriate for
      * this field, or if the type of the field cannot be converted to int via a widening conversion.
      */
-    int getInt(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    int getInt(JVMObject object) throws CorruptDataException, MemoryAccessException;
 
     /**
      * <p>
@@ -145,7 +145,7 @@
      * @throws IllegalArgumentException if the specified object is not appropriate for
      * this field, or if the type of the field cannot be converted to long via a widening conversion.
      */
-    long getLong(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    long getLong(JVMObject object) throws CorruptDataException, MemoryAccessException;
 
     /**
      * <p>
@@ -158,7 +158,7 @@
      * @throws IllegalArgumentException if the specified object is not appropriate for
      * this field, or if the type of the field cannot be converted to short via a widening conversion.
      */
-    short getShort(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    short getShort(JVMObject object) throws CorruptDataException, MemoryAccessException;
     
     /**
      * <p>
@@ -173,7 +173,7 @@
      * @throws IllegalArgumentException if the specified field is not a String
      * @throws NullPointerException if the field is an instance field, and object is null
      */
-    String getString(JavaObject object) throws CorruptDataException, MemoryAccessException;
+    String getString(JVMObject object) throws CorruptDataException, MemoryAccessException;
     
 	/**
 	 * @param obj

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMHeap.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaHeap.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMHeap.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMHeap.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaHeap.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaHeap.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMHeap.java Wed Oct 21 10:36:50 2009
@@ -23,13 +23,13 @@
  * The heap can be viewed as an unordered collection of JavaObjects or as a region of storage 
  * within the Java Virtual Machiine instance. 
  * 
- * The heap commonly contains JavaObject instances that are reachable by navigating chains of {@link JavaReference}
- * These references can be obtained from the {@link JavaRuntime#getHeapRoots()} method.
+ * The heap commonly contains JavaObject instances that are reachable by navigating chains of {@link JVMReference}
+ * These references can be obtained from the {@link JVMRuntime#getHeapRoots()} method.
  * 
- * A heap can contain instances which cannot be reached by the use of {@link JavaReference}  
+ * A heap can contain instances which cannot be reached by the use of {@link JVMReference}  
  * 
  */
-public interface JavaHeap {
+public interface JVMHeap {
     
     /**
      * Get the set of memory regions that represent the memory layout of the heap.
@@ -59,15 +59,15 @@
     /**
      * Get the set of objects which are stored in this heap.
      * 
-     * @return a list  of {@link JavaObject} objects which are stored in this heap
+     * @return a list  of {@link JVMObject} objects which are stored in this heap
      * 
      * The returned list follows the standard semantics for javax.tools.diagnostics collections.
      * 
      * The returned value is never null but can be an empty list.
      * 
-     * @see JavaObject
+     * @see JVMObject
      */
-    List<JavaObject> getObjects();
+    List<JVMObject> getObjects();
     
 	/**
 	 * @param obj

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMInitArgs.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVMInitArgs.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMInitArgs.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMInitArgs.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVMInitArgs.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVMInitArgs.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMInitArgs.java Wed Oct 21 10:36:50 2009
@@ -27,7 +27,7 @@
  * Typically the options passed to the JVM are similar but necessarily identical to these used to invoke the Java Virtual Machine from a command line.
  * 
  */
-public interface JavaVMInitArgs {
+public interface JVMInitArgs {
 
 	/**
 	 * The JNI specified version constant for the Java 1.1 version of JNI 
@@ -80,8 +80,8 @@
 	 * @return an List of JavaVMOptions
 	 * @throws DataUnavailable
 	 * 
-	 * @see JavaVMOption
+	 * @see JVMOption
 	 */
-	List<JavaVMOption> getOptions() throws DataUnavailable;
+	List<JVMOption> getOptions() throws DataUnavailable;
 
 }

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMLocation.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaLocation.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMLocation.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMLocation.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaLocation.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaLocation.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMLocation.java Wed Oct 21 10:36:50 2009
@@ -22,7 +22,7 @@
  * Represents a point of execution within a Java method
  * 
  */
-public interface JavaLocation {
+public interface JVMLocation {
 	
 	/**
 	 * <p>
@@ -96,7 +96,7 @@
 	 * @return the method which contains the point of execution
 	 * @throws CorruptDataException if the underlying data is in an unexpected state  
 	 */
-	JavaMethod getMethod() throws CorruptDataException;
+	JVMMethod getMethod() throws CorruptDataException;
 	
 	/**
 	 * @return A string representing the location as it would be seen in a Java stack trace

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMember.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMember.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMember.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMember.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMember.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMember.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMember.java Wed Oct 21 10:36:50 2009
@@ -22,7 +22,7 @@
  * It defines APIs which are common to both types of members.
  * It is modelled on java.lang.reflect.Member
  */
-public interface JavaMember {
+public interface JVMMember {
 
 	/**
 	 * <p>
@@ -43,7 +43,7 @@
      * @throws CorruptDataException if the underlying data is in an unexpected state  
      * @throws DataUnavailable if there is no declaring class available
      */
-    JavaClass getDeclaringClass() throws CorruptDataException, DataUnavailable;
+    JVMClass getDeclaringClass() throws CorruptDataException, DataUnavailable;
     
     /**
      * <p>

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMethod.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMethod.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMethod.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMethod.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMethod.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMethod.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMethod.java Wed Oct 21 10:36:50 2009
@@ -22,7 +22,7 @@
  * <p>
  * Represents a method or constructor in a class
  */
-public interface JavaMethod extends JavaMember {
+public interface JVMMethod extends JVMMember {
 
     /**
      * <p>
@@ -67,14 +67,14 @@
      * <p>
      * An experimental addition to the API.
      * <p>
-     * Get the set of {@link JavaVariable} objects
+     * Get the set of {@link JVMVariable} objects
      * <p>The returned list follows the standard semantics for javax.tools.diagnostics collections.</p>
      * <p>The returned list is never null but could be empty.</p>
      * 
      * @return List of JavaVariable objects available
      *  
      */
-    List<JavaVariable> getVariables();  
+    List<JVMVariable> getVariables();  
     
 	/**
 	 * @param obj

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMonitor.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMonitor.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMonitor.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMonitor.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMonitor.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMonitor.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMMonitor.java Wed Oct 21 10:36:50 2009
@@ -44,7 +44,7 @@
  * <p>This API presents only what exists at the Java Virtual Machine bytecode level. The locking facilities provided by the {@link java.util.concurrent.lock}
  * package are expected to be implemented on top of ordinary Java monitors.</p>
  */
-public interface JavaMonitor {
+public interface JVMMonitor {
     
     /**
      * <p>Get the object associated with this monitor. Not all JavaMonitors will have objects, as there may be JavaMonitors that
@@ -53,7 +53,7 @@
      *  
      * @return the Java object associated with this monitor, or null.
      */
-    JavaObject getObject();
+    JVMObject getObject();
 
     /**
      * <p>Get the name of a monitor.</p>
@@ -78,7 +78,7 @@
      * @return the owner of the monitor, or null if the monitor is not owned
      * @throws CorruptDataException 
      */
-    JavaThread getOwner() throws CorruptDataException;
+    JVMThread getOwner() throws CorruptDataException;
     
     /**
      * <p>Get the set of threads waiting to enter the monitor. 
@@ -88,10 +88,10 @@
     
      * @return a list of threads waiting to enter this monitor
      * 
-     * @see JavaThread
+     * @see JVMThread
      * @see javax.tools.diagnostics.image.CorruptData
      */
-    List<JavaThread> getEnterWaiters();
+    List<JVMThread> getEnterWaiters();
     
     /**
      * <p>Get the set of threads waiting to be notified on the monitor. 
@@ -101,10 +101,10 @@
      * 
      * @return a list of threads waiting to be notified on this monitor.
      * 
-     * @see JavaThread
+     * @see JVMThread
      * @see javax.tools.diagnostics.image.CorruptData
      */
-    List<JavaThread> getNotifyWaiters();
+    List<JVMThread> getNotifyWaiters();
     
     /**
      * <p>Get the identifier for this monitor.</p>

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMObject.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaObject.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMObject.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMObject.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaObject.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaObject.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMObject.java Wed Oct 21 10:36:50 2009
@@ -27,14 +27,14 @@
 /**
  * <p>Represents a Java object or array.</p>
  * <p>Array elements can be retrieved using the {@link #arraycopy()} method. Object instance fields
- * can be retrieved using the <code>get*()</code> methods in {@link JavaField} such as
- * {@link JavaField#get(JavaObject)}. The {@link JavaField} objects can be retrieved from an
- * object's {@link JavaClass} using {@link JavaClass#getDeclaredFields()}. 
+ * can be retrieved using the <code>get*()</code> methods in {@link JVMField} such as
+ * {@link JVMField#get(JavaObject)}. The {@link JVMField} objects can be retrieved from an
+ * object's {@link JVMClass} using {@link JVMClass#getDeclaredFields()}. 
  * </p> 
  * 
  * 
  */
-public interface JavaObject {
+public interface JVMObject {
     
     /**
      * <p>Get the JavaClass instance which represents the class of this object.</p>
@@ -44,7 +44,7 @@
      * @return the JavaClass instance which represents the class of this object.
      * @throws CorruptDataException 
      */
-    JavaClass getJavaClass() throws CorruptDataException;
+    JVMClass getJavaClass() throws CorruptDataException;
     
     /**
      * <p>Returns true if this JavaObject represents an array.</p>
@@ -177,23 +177,23 @@
 	 * references to other objects.</p>
 	 *
 	 * @return an List of JavaReferences.
-	 * @see javax.tools.diagnostics.runtime.java.JavaReference
+	 * @see javax.tools.diagnostics.runtime.java.JVMReference
 	 *
 	 */
-	List<JavaReference> getReferences();
+	List<JVMReference> getReferences();
     
     /**
      * <p>Gets the heap where this object is located.</p>
      * <p>A JavaHeap will always be returned if this object could be retrieved by
-     * {@link JavaHeap#getObject()}, otherwise {@link DataUnavailable} is thrown.
+     * {@link JVMHeap#getObject()}, otherwise {@link DataUnavailable} is thrown.
      * </p>
      * 
-     * @return	the {@link JavaHeap} instance representing the heap where this object is stored in memory.
+     * @return	the {@link JVMHeap} instance representing the heap where this object is stored in memory.
      * @throws 	CorruptDataException	if the heap information for this object is corrupt.
      * @throws 	DataUnavailable			if the heap information for this object is not available.
-     * @see 	JavaHeap
+     * @see 	JVMHeap
      */
-    JavaHeap getHeap() throws CorruptDataException, DataUnavailable;
+    JVMHeap getHeap() throws CorruptDataException, DataUnavailable;
 	
 	/**
 	 * @param obj

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMOption.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVMOption.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMOption.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMOption.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVMOption.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVMOption.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMOption.java Wed Oct 21 10:36:50 2009
@@ -27,7 +27,7 @@
  * <li> an extraInfo pointer, used to pass additional information. This component is usually NULL.</li>
  * </ol>
  */
-public interface JavaVMOption {
+public interface JVMOption {
 
 	/**
 	 * Fetch the optionString component of the option.

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMReference.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaReference.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMReference.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMReference.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaReference.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaReference.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMReference.java Wed Oct 21 10:36:50 2009
@@ -27,7 +27,7 @@
  * reclaimed.
  *  
  */
-public interface JavaReference
+public interface JVMReference
 {
     
 	/** Unknown heap root type */

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMRuntime.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaRuntime.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMRuntime.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMRuntime.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaRuntime.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaRuntime.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMRuntime.java Wed Oct 21 10:36:50 2009
@@ -36,7 +36,7 @@
  * Since this interface defines a view of the Java Runtime that is beyond that seen by the Java programmer during program execution it is necessarily more detailed.
  *    
  */
-public interface JavaRuntime extends ManagedRuntime {
+public interface JVMRuntime extends ManagedRuntime {
 
     /**
      * Get the object that represents the virtual machine
@@ -47,7 +47,7 @@
     ImagePointer getJavaVM() throws CorruptDataException;
     
     /**
-     * Fetch the {@link JavaVMInitArgs} which were used to create this VM.
+     * Fetch the {@link JVMInitArgs} which were used to create this VM.
      * See <a href="http://java.sun.com/javase/6/docs/technotes/guides/jni/spec/invocation.html#wp16334">JNI_CreateJavaVM</a> in the JNI Specification for more details.
      * 
      * A valid object is returned or an exception is thrown.
@@ -56,7 +56,7 @@
      * @throws DataUnavailable if the arguments are not available 
      * @throws CorruptDataException if the implementation was unexpectedly unable to retrieve the data
      */
-    JavaVMInitArgs getJavaVMInitArgs() throws DataUnavailable, CorruptDataException;
+    JVMInitArgs getJavaVMInitArgs() throws DataUnavailable, CorruptDataException;
     
     /**
      * Get the set of class loaders available in this Java Virtual Machine instance.
@@ -73,9 +73,9 @@
      * 
      * @return a {@link java.util.List} of all of the class loaders within this Java Virtual Machine instance
      * 
-     * @see JavaClassLoader
+     * @see JVMClassLoader
      */
-    List<JavaClassLoader> getJavaClassLoaders();
+    List<JVMClassLoader> getJavaClassLoaders();
     
     /**
      * Get the set of Java Threads that have been started {@link java.lang.Thread#start()} in this Java Virtual Machine instance.
@@ -88,10 +88,10 @@
      * 
      * @return a {@link java.util.List} of the JavaThreads in the runtime
      * 
-     * @see JavaThread
+     * @see JVMThread
      */
     
-    List<JavaThread> getThreads();
+    List<JVMThread> getThreads();
     
     /**
      * Get the set of JavaMethod objects that have been compiled.  
@@ -99,7 +99,7 @@
      * Compiled methods are methods that have been converted into native code by the Java Virtual Machine or related Just In Time Compiler
      * 
      * There is no expectation that any method has been compiled. The returned list could be empty.
-     * However any JavaMethod reachable though the API which would return a non empty list for calls to {@link JavaMethod#getCompiledSections()} must be contained within the list
+     * However any JavaMethod reachable though the API which would return a non empty list for calls to {@link JVMMethod#getCompiledSections()} must be contained within the list
      * returned by this method.  
      * 
      * The returned list follows the standard semantics for javax.tools.diagnostics collections
@@ -107,9 +107,9 @@
      * @return a {@link java.util.List} of all of the JavaMethods in the JavaRuntime which
      * have been compiled.
      * 
-     * @see JavaMethod
+     * @see JVMMethod
      */
-    List<JavaMethod> getCompiledMethods();
+    List<JVMMethod> getCompiledMethods();
     
     /**
      * Provides access to the collection of monitors used in the Java Virtual Machine. This 
@@ -124,10 +124,10 @@
      * 
      * @return a list of monitors
      * 
-     * @see JavaMonitor
+     * @see JVMMonitor
      * @see javax.tools.diagnostics.image.CorruptData
      */
-    List<JavaMonitor> getMonitors();
+    List<JVMMonitor> getMonitors();
     
     /**
      * Get the set of heaps known by the Java Virtual Machine
@@ -140,10 +140,10 @@
      * The returned list is never null and will always contain at least one JavaHeap object
      * 
   	 * @return a list for all of the Java heaps within this runtime. 
-     * @see JavaHeap
+     * @see JVMHeap
      * @see javax.tools.diagnostics.image.CorruptData
      */
-    List<JavaHeap> getHeaps();
+    List<JVMHeap> getHeaps();
     
     /**
      * Get the complete set of object and class roots known to the Java Virtual Machine
@@ -154,12 +154,12 @@
      * 
      * The returned list is never null but can be empty.
 
-     * @see JavaReference
-     * @see JavaStackFrame
+     * @see JVMReference
+     * @see JVMStackFrame
      * @see javax.tools.diagnostics.image.CorruptData
      * 
      */
-    List<JavaReference> getHeapRoots();
+    List<JVMReference> getHeapRoots();
     
     /**
      * @remove candidate for removal as its an arbitary implementation specific method
@@ -182,9 +182,9 @@
      * @throws 	MemoryAccessException 		if  <code>address</code> is is in the heap but it's not accessible from the dump;
      * @throws 	CorruptDataException 		if any data needed to build the returned instance of <code>JavaObject</code> is corrupt.
      * @throws 	DataUnavailable	 			if any data needed to build the returned instance of <code>JavaObject</code> is not available.
-     * @see 	javax.tools.diagnostics.runtime.java.JavaObject
+     * @see 	javax.tools.diagnostics.runtime.java.JVMObject
      */
-     JavaObject getObjectAtAddress(ImagePointer address) throws CorruptDataException, IllegalArgumentException, MemoryAccessException, DataUnavailable;
+     JVMObject getObjectAtAddress(ImagePointer address) throws CorruptDataException, IllegalArgumentException, MemoryAccessException, DataUnavailable;
     
 	/**
 	 * @param obj

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMStackFrame.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaStackFrame.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMStackFrame.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMStackFrame.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaStackFrame.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaStackFrame.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMStackFrame.java Wed Oct 21 10:36:50 2009
@@ -27,7 +27,7 @@
  * 
  *
  */
-public interface JavaStackFrame {
+public interface JVMStackFrame {
     /**
      * <p>Get a pointer to the base of this stack frame within memory.</p>
      * <p>The layout of a <code>JavaStackFrame</code> is implementation specific.
@@ -40,16 +40,16 @@
     
 	/**
      * <p>
-     * Returns the {@link JavaLocation} that represents the location of this 
+     * Returns the {@link JVMLocation} that represents the location of this 
      * <code>JavaStackFrame</code> within the Java program.
      * </p>
      * 
      * @return a location object describing where the frame is executing.
 	 * @throws CorruptDataException 
      * 
-     * @see JavaLocation
+     * @see JVMLocation
      */
-    JavaLocation getLocation() throws CorruptDataException;
+    JVMLocation getLocation() throws CorruptDataException;
     
     /**
      * <p>A list of references to objects and classes from this stack frame.
@@ -63,13 +63,13 @@
 	 * 
      * @return a list of JavaReferences
      */
-	List<JavaReference> getHeapRoots();                      
+	List<JVMReference> getHeapRoots();                      
 
 	/**
 	 * 
 	 * <p>Gets the value of a variable from a stack frame.</p>
 	 * 
-	 * <p>Returns a {@link JavaObject} for an object reference, <code>null</code> for a null object reference.
+	 * <p>Returns a {@link JVMObject} for an object reference, <code>null</code> for a null object reference.
 	 * Primitives are returned as boxed primitives.
 	 * CorruptDataException is thrown if object reference is incorrect, or if the float or double are set to invalid values.
 	 * </p>
@@ -87,8 +87,8 @@
 	/**
 	 * <p>Gets all variables from the stack frame.</p>
 	 * <p>
-	 * Returns a {@link java.util.List} containing the available {@link JavaVariable JavaVariables}.
-	 * While the method {@link JavaMethod#getVariables()} will return all local variables for a method,
+	 * Returns a {@link java.util.List} containing the available {@link JVMVariable JavaVariables}.
+	 * While the method {@link JVMMethod#getVariables()} will return all local variables for a method,
 	 * this method will return only those variables that are visible at the point of execution for this
 	 * stack frame.
 	 * </p>
@@ -96,7 +96,7 @@
 	 * 
 	 */
 
-	List<JavaVariable> getVariables(); 
+	List<JVMVariable> getVariables(); 
 
 	/**
 	 * @param obj

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMThread.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaThread.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMThread.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMThread.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaThread.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaThread.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMThread.java Wed Oct 21 10:36:50 2009
@@ -32,9 +32,9 @@
  * of all of the threads within the Java program when the dump was taken.
  * </p> 
  *  
- * @see JavaRuntime#getThreads()
+ * @see JVMRuntime#getThreads()
  */
-public interface JavaThread  {
+public interface JVMThread  {
 
 	/** The thread is alive	 */
 	int STATE_ALIVE						= 0x00000001;
@@ -91,7 +91,7 @@
     
 
     /**
-     * <p>Returns the {@link JavaObject} representing the instance of the class or subclass of {@link java.lang.Thread}
+     * <p>Returns the {@link JVMObject} representing the instance of the class or subclass of {@link java.lang.Thread}
      * that represents this thread in the Java Virtual Machine.</p>
      * 
      * <p>The object returned is the {@link java.lang.Thread} instance the method 
@@ -108,10 +108,10 @@
      * @return a JavaObject representing the {@link java.lang.Thread} associated with this thread, or <code>null</code>.
      * @throws CorruptDataException if the reference to <code>java.lang.Thread</code> is not <code>null</code> and cannot be retrieved.
      * 
-     * @see JavaObject
+     * @see JVMObject
      * @see java.lang.Thread
      */
-    JavaObject getObject() throws CorruptDataException;
+    JVMObject getObject() throws CorruptDataException;
     
     /**
      * <p>Get the state of the thread when the dump was generated.</p>
@@ -173,10 +173,10 @@
      * 
      * @return a list of Java stack frames in order from top to bottom.
      *  
-     * @see JavaStackFrame
+     * @see JVMStackFrame
      * 
      */
-    List<JavaStackFrame> getStackFrames();
+    List<JVMStackFrame> getStackFrames();
     
     /**
      * <p>Return the name of the thread.</p>

Copied: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMVariable.java (from r827910, incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVariable.java)
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMVariable.java?p2=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMVariable.java&p1=incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVariable.java&r1=827910&r2=827955&rev=827955&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaVariable.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JVMVariable.java Wed Oct 21 10:36:50 2009
@@ -22,7 +22,7 @@
  * <p>
  * This is an experimental addition and may be removed at a later date
  */
-public interface JavaVariable {
+public interface JVMVariable {
 
 	
 	/**

Propchange: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Oct 21 10:36:50 2009
@@ -0,0 +1 @@
+target