incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r897877 - in /incubator/kato/trunk/org.apache.kato: kato.cjvmti/ kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/ kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/ kato.cjvmti/src/main/java/org/apache/kato/jvmti...
Date Mon, 11 Jan 2010 14:31:41 GMT
Author: spoole
Date: Mon Jan 11 14:31:40 2010
New Revision: 897877

URL: http://svn.apache.org/viewvc?rev=897877&view=rev
Log:
moved cjvmti java model code into new dump model module and into common as appropriate.

Added:
    incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/util/SimpleImagePointer.java
      - copied, changed from r897866, incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/SimpleImagePointer.java
    incubator/kato/trunk/org.apache.kato/kato.common/src/main/java/org/apache/kato/common/CLogger.java
      - copied, changed from r897866, incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CLogger.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/
      - copied from r897866, incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/CorruptDataImpl.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JavaRuntimeImpl.java
      - copied, changed from r897866, incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/test/java/org/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/test/java/org/apache/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/test/java/org/apache/kato/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/test/java/org/apache/kato/jvmti/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/test/java/org/apache/kato/jvmti/javaruntime/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/test/java/org/apache/kato/jvmti/javaruntime/model/
      - copied from r897866, incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/test/java/org/apache/kato/jvmti/javaruntime/model/
Removed:
    incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java
    incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/
    incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CLogger.java
    incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/test/java/org/apache/kato/jvmti/javaruntime/model/
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/SimpleImagePointer.java
Modified:
    incubator/kato/trunk/org.apache.kato/kato.cjvmti/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageImpl.java
    incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java
    incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java

Modified: incubator/kato/trunk/org.apache.kato/kato.cjvmti/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.cjvmti/pom.xml?rev=897877&r1=897876&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.cjvmti/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.cjvmti/pom.xml Mon Jan 11 14:31:40 2010
@@ -35,6 +35,16 @@
   		<version>M1-incubating</version>
   	</dependency>
   	<dependency>
+  		<groupId>org.apache.kato</groupId>
+  		<artifactId>kato.common</artifactId>
+  		<version>M1-incubating</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.kato</groupId>
+  		<artifactId>kato.dump.model</artifactId>
+  		<version>M1-incubating</version>
+  	</dependency>
+  	<dependency>
 		<groupId>junit</groupId>
 		<artifactId>junit</artifactId>
 		<version>3.8.1</version>

Modified: incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageImpl.java?rev=897877&r1=897876&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageImpl.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/process/ImageImpl.java
Mon Jan 11 14:31:40 2010
@@ -34,9 +34,9 @@
 import javax.tools.diagnostics.image.ImageThread;
 import javax.tools.diagnostics.runtime.ManagedRuntime;
 
-import org.apache.kato.jvmti.javaruntime.JavaRuntimeImpl;
-import org.apache.kato.jvmti.javaruntime.model.SimpleImagePointer;
+import org.apache.kato.jvmti.javaruntime.model.JavaRuntimeImpl;
 import org.apache.kato.jvmti.reader.CJVMTIBinReader;
+import org.apache.kato.jvmti.util.SimpleImagePointer;
 
 /**
  * Implements the main Image hierarchy.

Modified: incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java?rev=897877&r1=897876&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CJVMTIBinReader.java
Mon Jan 11 14:31:40 2010
@@ -34,6 +34,7 @@
 import javax.tools.diagnostics.runtime.java.JavaThread;
 import javax.tools.diagnostics.runtime.java.JavaVariable;
 
+import org.apache.kato.common.CLogger;
 import org.apache.kato.jvmti.javaruntime.model.DeferredReference;
 import org.apache.kato.jvmti.javaruntime.model.JClass;
 import org.apache.kato.jvmti.javaruntime.model.JClassLoader;

Copied: incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/util/SimpleImagePointer.java
(from r897866, incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/SimpleImagePointer.java)
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/util/SimpleImagePointer.java?p2=incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/util/SimpleImagePointer.java&p1=incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/SimpleImagePointer.java&r1=897866&r2=897877&rev=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/SimpleImagePointer.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/util/SimpleImagePointer.java
Mon Jan 11 14:31:40 2010
@@ -12,7 +12,7 @@
  * limitations under the License.
  ******************************************************************************/
 
-package org.apache.kato.jvmti.javaruntime.model;
+package org.apache.kato.jvmti.util;
 
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;

Copied: incubator/kato/trunk/org.apache.kato/kato.common/src/main/java/org/apache/kato/common/CLogger.java
(from r897866, incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CLogger.java)
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.common/src/main/java/org/apache/kato/common/CLogger.java?p2=incubator/kato/trunk/org.apache.kato/kato.common/src/main/java/org/apache/kato/common/CLogger.java&p1=incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CLogger.java&r1=897866&r2=897877&rev=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/reader/CLogger.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.common/src/main/java/org/apache/kato/common/CLogger.java
Mon Jan 11 14:31:40 2010
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package org.apache.kato.jvmti.reader;
+package org.apache.kato.common;
 
 import java.util.logging.Logger;
 

Modified: incubator/kato/trunk/org.apache.kato/kato.dump.model/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/pom.xml?rev=897877&r1=897876&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.dump.model/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/pom.xml Mon Jan 11 14:31:40 2010
@@ -17,5 +17,17 @@
       <version>M1-incubating</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.kato</groupId>
+      <artifactId>kato.common</artifactId>
+      <version>M1-incubating</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+		<groupId>junit</groupId>
+		<artifactId>junit</artifactId>
+		<version>3.8.1</version>
+		<scope>test</scope>
+	</dependency>
   </dependencies>
 </project>
\ No newline at end of file

Added: incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/CorruptDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/CorruptDataImpl.java?rev=897877&view=auto
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/CorruptDataImpl.java
(added)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/CorruptDataImpl.java
Mon Jan 11 14:31:40 2010
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.jvmti.javaruntime.model;
+
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.ImagePointer;
+
+/**
+ * Implementation of CorruptData.
+ * Very simply - all implementations should be like this.
+ * 
+ */
+public class CorruptDataImpl implements CorruptData {
+	private String string;
+	private ImagePointer pointer = null;
+	
+	/**
+	 * Convenience method for creating CorruptDataException instances.
+	 * They always take a CorruptData object.
+	 * 
+	 * @param desc Description of corrupt data.
+	 * @return a CorruptDataException with an initialized CorruptData instance.
+	 */
+	static public CorruptDataException corruptDataException(String desc) {
+		return new CorruptDataException(new CorruptDataImpl(desc));
+	}
+	
+	/**
+	 * Convenience method for creating CorruptDataException instances.
+	 * They always take a CorruptData object.
+	 * 
+	 * @param desc Description of corrupt data.
+	 * @param pointer locations of corrupt data.
+	 * @return a CorruptDataException with an initialized CorruptData instance.
+	 */
+	static public CorruptDataException corruptDataException(String desc, ImagePointer pointer)
{
+		return new CorruptDataException(new CorruptDataImpl(desc, pointer));
+	}
+	
+	/**
+	 * Constructor for CorruptDataImpl. Takes a String. 
+	 * @param desc description of the corrupt data.
+	 */
+	public CorruptDataImpl(String desc) {
+		this.string = desc;
+	}
+	
+	/**
+	 * Constructor for CorruptDataImpl. Takes a String. 
+	 * @param desc description of the corrupt data.
+	 * @param pointer ImagePointer to locate corrupt data. 
+	 */	
+	public CorruptDataImpl(String desc, ImagePointer pointer) {
+		this.string = desc;
+		this.pointer = pointer;
+	}
+	
+	@Override
+	public ImagePointer getAddress() {
+		return pointer;
+	}
+
+	@Override
+	public String toString() {
+		return string +
+		((pointer == null) ? "" : ", @  0x" + Long.toHexString(pointer.getAddress()));	
+	}
+}

Modified: incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java?rev=897877&r1=897866&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java
Mon Jan 11 14:31:40 2010
@@ -27,8 +27,6 @@
 import javax.tools.diagnostics.runtime.java.JavaObject;
 import javax.tools.diagnostics.runtime.java.JavaReference;
 
-import org.apache.kato.jvmti.process.CorruptDataImpl;
-
 public class JClass implements JavaClass {
 	/**
 	 * 

Modified: incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java?rev=897877&r1=897866&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java
Mon Jan 11 14:31:40 2010
@@ -23,8 +23,7 @@
 import javax.tools.diagnostics.runtime.java.JavaField;
 import javax.tools.diagnostics.runtime.java.JavaObject;
 
-import org.apache.kato.jvmti.process.CorruptDataImpl;
-import org.apache.kato.jvmti.reader.CLogger;
+import org.apache.kato.common.CLogger;
 
 public class JField implements JavaField, JValueHolder {
 

Modified: incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java?rev=897877&r1=897866&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java
Mon Jan 11 14:31:40 2010
@@ -16,8 +16,6 @@
 
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
-import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.Handle;
 import javax.tools.diagnostics.runtime.java.JavaLocation;
 import javax.tools.diagnostics.runtime.java.JavaMethod;
 

Modified: incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java?rev=897877&r1=897866&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
Mon Jan 11 14:31:40 2010
@@ -28,7 +28,7 @@
 import javax.tools.diagnostics.runtime.java.JavaClass;
 import javax.tools.diagnostics.runtime.java.JavaMethod;
 
-import org.apache.kato.jvmti.reader.CLogger;
+import org.apache.kato.common.CLogger;
 
 public class JMethod implements JavaMethod {
 

Modified: incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java?rev=897877&r1=897866&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java
Mon Jan 11 14:31:40 2010
@@ -32,8 +32,7 @@
 import javax.tools.diagnostics.runtime.java.JavaObject;
 import javax.tools.diagnostics.runtime.java.JavaReference;
 
-import org.apache.kato.jvmti.process.CorruptDataImpl;
-import org.apache.kato.jvmti.reader.CLogger;
+import org.apache.kato.common.CLogger;
 
 /**
  * Represents a Java object.

Modified: incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java?rev=897877&r1=897866&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java
Mon Jan 11 14:31:40 2010
@@ -20,14 +20,13 @@
 
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
-import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.runtime.java.Handle;
 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 org.apache.kato.jvmti.reader.CLogger;
+import org.apache.kato.common.CLogger;
 
 public class JStackFrame implements JavaStackFrame {
 	private static int stackFrameIDCount = 1;

Modified: incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java?rev=897877&r1=897866&r2=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java
Mon Jan 11 14:31:40 2010
@@ -25,7 +25,7 @@
 import javax.tools.diagnostics.runtime.java.JavaThread;
 import javax.tools.diagnostics.runtime.java.NativeJavaThread;
 
-import org.apache.kato.jvmti.reader.CLogger;
+import org.apache.kato.common.CLogger;
 
 public class JThread implements JavaThread{
 	public JMonitor contendedMonitor=null;

Copied: incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JavaRuntimeImpl.java
(from r897866, incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java)
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JavaRuntimeImpl.java?p2=incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JavaRuntimeImpl.java&p1=incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java&r1=897866&r2=897877&rev=897877&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.dump.model/src/main/java/org/apache/kato/jvmti/javaruntime/model/JavaRuntimeImpl.java
Mon Jan 11 14:31:40 2010
@@ -12,7 +12,7 @@
  * limitations under the License.
  ******************************************************************************/
 
-package org.apache.kato.jvmti.javaruntime;
+package org.apache.kato.jvmti.javaruntime.model;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,14 +36,12 @@
 import javax.tools.diagnostics.runtime.java.JavaThread;
 import javax.tools.diagnostics.runtime.java.JavaVMInitArgs;
 
-import org.apache.kato.jvmti.javaruntime.model.JHandle;
-import org.apache.kato.jvmti.javaruntime.model.Model;
-import org.apache.kato.jvmti.reader.CJVMTIBinReader;
-import org.apache.kato.jvmti.reader.CLogger;
+import org.apache.kato.common.CLogger;
 
 public class JavaRuntimeImpl implements JavaRuntime {	
 	private Model model=null;
 	private File source;
+	private String version=null;
 	
 	public JavaRuntimeImpl(Model model, File source) throws IOException {
 		this.model=model;
@@ -120,12 +118,12 @@
 
 	@Override
 	public String getFullVersion() throws CorruptDataException {
-		return CJVMTIBinReader.CJVMTI_VERSION_STRING;
+		return version;
 	}
 
 	@Override
 	public String getVersion() throws CorruptDataException {
-		return CJVMTIBinReader.CJVMTI_VERSION_STRING;
+		return version;
 	}
 
 	@Override
@@ -144,4 +142,8 @@
 		
 	}
 
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
 }



Mime
View raw message