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/07/10 23:03:35 UTC

svn commit: r793139 - in /incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview: ./ commands/ commands/helpers/ commands/infocommands/ commands/setcommands/ commands/showcomman...

Author: spoole
Date: Fri Jul 10 23:03:33 2009
New Revision: 793139

URL: http://svn.apache.org/viewvc?rev=793139&view=rev
Log:
updated katoview project to use renamed api packages

Modified:
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/KatoView.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Session.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Version.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/CdCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/Command.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/DeadlockCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/ExitCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindNextCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindPtrCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HeapdumpCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HelpCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HexdumpCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/MinusCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PlusCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PwdCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/QuitCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/RootCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XPathCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ClassOutput.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaClassVisitor.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaObjectVisitor.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoMmapCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoProcCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSymCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSystemCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetHeapdumpCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetLoggingCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowHeapdumpCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowLoggingCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XDCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XKCommand.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XXCommand.java

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/KatoView.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/KatoView.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/KatoView.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/KatoView.java Fri Jul 10 23:03:33 2009
@@ -13,7 +13,7 @@
  ******************************************************************************/
 package org.apache.kato.katoview;
 
-import org.apache.kato.FactoryRegistry;
+import javax.tools.diagnostics.FactoryRegistry;
 
 
 public class KatoView {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Session.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Session.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Session.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Session.java Fri Jul 10 23:03:33 2009
@@ -20,10 +20,11 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.FactoryRegistry;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageFactory;
+import javax.tools.diagnostics.FactoryRegistry;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageFactory;
+
 import org.apache.kato.katoview.commands.RootCommand;
 import org.apache.kato.katoview.commands.helpers.Utils;
 
@@ -37,8 +38,8 @@
 	private Output out;
 	
 	private static final String defaultFactoryName = ""; //TODO: assign proper factory class name 
-	private static final String factoryProperty = "org.apache.kato.image.factoryclass";
-	private static final String launcherProperty = "org.apache.kato.tools.katoview.launcher";
+	private static final String factoryProperty = "javax.tools.diagnostics.image.factoryclass";
+	private static final String launcherProperty = "javax.tools.diagnostics.tools.katoview.launcher";
 	
 	public Session(String[] args) {
 		sessionInit(args);

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Version.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Version.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Version.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/Version.java Fri Jul 10 23:03:33 2009
@@ -13,7 +13,7 @@
  ******************************************************************************/
 package org.apache.kato.katoview;
 
-import org.apache.kato.image.ImageFactory;
+import javax.tools.diagnostics.image.ImageFactory;
 
 public class Version {
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/CdCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/CdCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/CdCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/CdCommand.java Fri Jul 10 23:03:33 2009
@@ -17,7 +17,8 @@
 import java.util.Stack;
 import java.io.File;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.helpers.Utils;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/Command.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/Command.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/Command.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/Command.java Fri Jul 10 23:03:33 2009
@@ -18,7 +18,8 @@
 import java.util.Stack;
 import java.util.Iterator;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.helpers.Utils;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/DeadlockCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/DeadlockCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/DeadlockCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/DeadlockCommand.java Fri Jul 10 23:03:33 2009
@@ -20,8 +20,9 @@
 import java.util.SortedMap;
 import java.util.Vector;
 
-import org.apache.kato.image.*;
-import org.apache.kato.java.*;
+import javax.tools.diagnostics.image.*;
+import javax.tools.diagnostics.java.*;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.helpers.Exceptions;
 import org.apache.kato.katoview.commands.helpers.MonitorNode;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/ExitCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/ExitCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/ExitCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/ExitCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindCommand.java Fri Jul 10 23:03:33 2009
@@ -18,11 +18,12 @@
 import java.util.Iterator;
 import java.util.Stack;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImagePointer;
-import org.apache.kato.image.ImageSection;
-import org.apache.kato.image.MemoryAccessException;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.image.MemoryAccessException;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.helpers.Utils;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindNextCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindNextCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindNextCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindNextCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.helpers.Utils;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindPtrCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindPtrCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindPtrCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/FindPtrCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.helpers.Utils;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HeapdumpCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HeapdumpCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HeapdumpCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HeapdumpCommand.java Fri Jul 10 23:03:33 2009
@@ -28,20 +28,21 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.KatoException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageProcess;
-import org.apache.kato.image.MemoryAccessException;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaClassLoader;
-import org.apache.kato.java.JavaField;
-import org.apache.kato.java.JavaHeap;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.image.MemoryAccessException;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaClassLoader;
+import javax.tools.diagnostics.java.JavaField;
+import javax.tools.diagnostics.java.JavaHeap;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.heapdump.HeapDumpFormatter;
 import org.apache.kato.katoview.heapdump.HeapDumpSettings;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HelpCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HelpCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HelpCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HelpCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HexdumpCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HexdumpCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HexdumpCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/HexdumpCommand.java Fri Jul 10 23:03:33 2009
@@ -16,11 +16,12 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImagePointer;
-import org.apache.kato.image.MemoryAccessException;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.image.MemoryAccessException;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.helpers.Utils;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/MinusCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/MinusCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/MinusCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/MinusCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PlusCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PlusCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PlusCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PlusCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PwdCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PwdCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PwdCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/PwdCommand.java Fri Jul 10 23:03:33 2009
@@ -17,7 +17,8 @@
 import java.util.Stack;
 import java.io.File;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/QuitCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/QuitCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/QuitCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/QuitCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/RootCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/RootCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/RootCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/RootCommand.java Fri Jul 10 23:03:33 2009
@@ -18,7 +18,8 @@
 import java.util.Stack;
 import java.util.Vector;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java Fri Jul 10 23:03:33 2009
@@ -17,18 +17,19 @@
 import java.util.Iterator;
 import java.util.Stack;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageSection;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaHeap;
-import org.apache.kato.java.JavaMethod;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaHeap;
+import javax.tools.diagnostics.java.JavaMethod;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.ManagedRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.helpers.Utils;
-import org.apache.kato.runtime.ManagedRuntime;
 
 
 public class WhatisCommand extends Command {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XCommand.java Fri Jul 10 23:03:33 2009
@@ -17,7 +17,8 @@
 import java.util.Stack;
 import java.util.Vector;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.xcommands.XDCommand;
 import org.apache.kato.katoview.commands.xcommands.XJCommand;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XPathCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XPathCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XPathCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/XPathCommand.java Fri Jul 10 23:03:33 2009
@@ -17,11 +17,12 @@
 import java.util.Iterator;
 import java.util.Stack;
 
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.java.JavaRuntime;
+
 import org.apache.commons.jxpath.JXPathContext;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageProcess;
-import org.apache.kato.java.JavaRuntime;
 import org.apache.kato.katoview.Output;
 
 /**

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ClassOutput.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ClassOutput.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ClassOutput.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ClassOutput.java Fri Jul 10 23:03:33 2009
@@ -18,14 +18,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.ImageSection;
-import org.apache.kato.image.MemoryAccessException;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaField;
-import org.apache.kato.java.JavaMethod;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.image.MemoryAccessException;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaField;
+import javax.tools.diagnostics.java.JavaMethod;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+
 import org.apache.kato.katoview.Output;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaClassVisitor.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaClassVisitor.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaClassVisitor.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaClassVisitor.java Fri Jul 10 23:03:33 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.katoview.commands.helpers;
 
-import org.apache.kato.image.KatoException;
-import org.apache.kato.java.JavaClass;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.java.JavaClass;
 
 /**
  * Interface for visiting classes.

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaObjectVisitor.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaObjectVisitor.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaObjectVisitor.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaObjectVisitor.java Fri Jul 10 23:03:33 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.katoview.commands.helpers;
 
-import org.apache.kato.image.KatoException;
-import org.apache.kato.java.JavaObject;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.java.JavaObject;
 
 /**
  * Used to visit objects.

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java Fri Jul 10 23:03:33 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.katoview.commands.helpers;
 
-import org.apache.kato.image.KatoException;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.java.JavaRuntime;
 
 /**
  * Passed to methods to visit all runtimes in an image.

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java Fri Jul 10 23:03:33 2009
@@ -17,23 +17,24 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageProcess;
-import org.apache.kato.image.KatoException;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaClassLoader;
-import org.apache.kato.java.JavaField;
-import org.apache.kato.java.JavaHeap;
-import org.apache.kato.java.JavaLocation;
-import org.apache.kato.java.JavaMethod;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
-import org.apache.kato.java.JavaStackFrame;
-import org.apache.kato.java.JavaThread;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaClassLoader;
+import javax.tools.diagnostics.java.JavaField;
+import javax.tools.diagnostics.java.JavaHeap;
+import javax.tools.diagnostics.java.JavaLocation;
+import javax.tools.diagnostics.java.JavaMethod;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.java.JavaStackFrame;
+import javax.tools.diagnostics.java.JavaThread;
+
 
 /**
  * Provides utility classes for retrieving things from dumps

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java Fri Jul 10 23:03:33 2009
@@ -13,7 +13,7 @@
  ******************************************************************************/
 package org.apache.kato.katoview.commands.helpers;
 
-import org.apache.kato.java.JavaMonitor;
+import javax.tools.diagnostics.java.JavaMonitor;
 
 public class MonitorNode {
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java Fri Jul 10 23:03:33 2009
@@ -13,7 +13,7 @@
  ******************************************************************************/
 package org.apache.kato.katoview.commands.helpers;
 
-import org.apache.kato.java.JavaMonitor;
+import javax.tools.diagnostics.java.JavaMonitor;
 
 public class MonitorState {
 	

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java Fri Jul 10 23:03:33 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.katoview.commands.helpers;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaThread;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaThread;
 
 public class NodeList {
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java Fri Jul 10 23:03:33 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.katoview.commands.helpers;
 
-import org.apache.kato.java.JavaRuntime;
-import org.apache.kato.java.JavaThread;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.java.JavaThread;
 
 public class ThreadData {
 	

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java Fri Jul 10 23:03:33 2009
@@ -23,19 +23,20 @@
 import java.util.StringTokenizer;
 import java.lang.reflect.Modifier;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageProcess;
-import org.apache.kato.image.MemoryAccessException;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaClassLoader;
-import org.apache.kato.java.JavaField;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.image.MemoryAccessException;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaClassLoader;
+import javax.tools.diagnostics.java.JavaField;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.ManagedRuntime;
+
 import org.apache.kato.katoview.Output;
-import org.apache.kato.runtime.ManagedRuntime;
 
 
 public class Utils {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java Fri Jul 10 23:03:33 2009
@@ -18,20 +18,21 @@
 import java.util.Stack;
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.Image;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaClassLoader;
-import org.apache.kato.java.JavaHeap;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaClassLoader;
+import javax.tools.diagnostics.java.JavaHeap;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.ManagedRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.ClassOutput;
 import org.apache.kato.katoview.commands.helpers.Exceptions;
 import org.apache.kato.katoview.commands.helpers.Utils;
-import org.apache.kato.runtime.ManagedRuntime;
 
 
 public class InfoClassCommand extends Command{

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java Fri Jul 10 23:03:33 2009
@@ -17,17 +17,18 @@
 import java.util.Iterator;
 import java.util.Stack;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageSection;
-import org.apache.kato.java.JavaHeap;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.java.JavaHeap;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.ManagedRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Utils;
-import org.apache.kato.runtime.ManagedRuntime;
 
 
 public class InfoHeapCommand extends Command {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java Fri Jul 10 23:03:33 2009
@@ -17,13 +17,14 @@
 import java.util.Stack;
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageSection;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaClassLoader;
-import org.apache.kato.java.JavaMethod;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaClassLoader;
+import javax.tools.diagnostics.java.JavaMethod;
+import javax.tools.diagnostics.java.JavaRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Exceptions;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java Fri Jul 10 23:03:33 2009
@@ -18,14 +18,15 @@
 import java.util.Stack;
 import java.util.Vector;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaMonitor;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
-import org.apache.kato.java.JavaThread;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaMonitor;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.java.JavaThread;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Exceptions;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoMmapCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoMmapCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoMmapCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoMmapCommand.java Fri Jul 10 23:03:33 2009
@@ -17,8 +17,9 @@
 import java.util.Stack;
 import java.util.Iterator;
 
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageSection;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageSection;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Utils;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoProcCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoProcCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoProcCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoProcCommand.java Fri Jul 10 23:03:33 2009
@@ -19,13 +19,14 @@
 import java.util.Properties;
 import java.util.Enumeration;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageProcess;
-import org.apache.kato.image.ImageThread;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.image.ImageThread;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Exceptions;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java Fri Jul 10 23:03:33 2009
@@ -19,14 +19,15 @@
 import java.util.Properties;
 import java.util.Stack;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.KatoException;
-import org.apache.kato.image.MemoryAccessException;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaField;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.image.MemoryAccessException;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaField;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.JavaRuntimeVisitor;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSymCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSymCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSymCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSymCommand.java Fri Jul 10 23:03:33 2009
@@ -17,14 +17,15 @@
 import java.util.Iterator;
 import java.util.Stack;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageModule;
-import org.apache.kato.image.ImageProcess;
-import org.apache.kato.image.ImageSection;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageModule;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.image.ImageSection;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Exceptions;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSystemCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSystemCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSystemCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoSystemCommand.java Fri Jul 10 23:03:33 2009
@@ -17,13 +17,14 @@
 import java.util.Iterator;
 import java.util.Stack;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.runtime.ManagedRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Utils;
-import org.apache.kato.runtime.ManagedRuntime;
 
 
 public class InfoSystemCommand extends Command {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java Fri Jul 10 23:03:33 2009
@@ -21,23 +21,25 @@
 import java.util.Enumeration;
 import java.util.Properties;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.KatoException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageProcess;
-import org.apache.kato.image.ImageRegister;
-import org.apache.kato.image.ImageSection;
-import org.apache.kato.image.ImageStackFrame;
-import org.apache.kato.image.ImageThread;
-import org.apache.kato.java.JavaLocation;
-import org.apache.kato.java.JavaMonitor;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
-import org.apache.kato.java.JavaStackFrame;
-import org.apache.kato.java.JavaThread;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.image.ImageRegister;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.image.ImageStackFrame;
+import javax.tools.diagnostics.image.ImageThread;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.java.JavaLocation;
+import javax.tools.diagnostics.java.JavaMonitor;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.java.JavaStackFrame;
+import javax.tools.diagnostics.java.JavaThread;
+import javax.tools.diagnostics.runtime.ManagedRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Exceptions;
@@ -45,7 +47,6 @@
 import org.apache.kato.katoview.commands.helpers.StateToString;
 import org.apache.kato.katoview.commands.helpers.ThreadData;
 import org.apache.kato.katoview.commands.helpers.Utils;
-import org.apache.kato.runtime.ManagedRuntime;
 
 
 public class InfoThreadCommand extends Command{

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetHeapdumpCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetHeapdumpCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetHeapdumpCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetHeapdumpCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.heapdump.HeapDumpSettings;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetLoggingCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetLoggingCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetLoggingCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/setcommands/SetLoggingCommand.java Fri Jul 10 23:03:33 2009
@@ -19,7 +19,8 @@
 import java.io.FileWriter;
 import java.io.IOException;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.FileOutputChannel;
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowHeapdumpCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowHeapdumpCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowHeapdumpCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowHeapdumpCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.heapdump.HeapDumpSettings;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowLoggingCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowLoggingCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowLoggingCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/showcommands/ShowLoggingCommand.java Fri Jul 10 23:03:33 2009
@@ -16,7 +16,8 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java Fri Jul 10 23:03:33 2009
@@ -17,15 +17,16 @@
 import java.util.List;
 import java.util.Stack;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.KatoException;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaLocation;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
-import org.apache.kato.java.JavaStackFrame;
-import org.apache.kato.java.JavaThread;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaLocation;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.java.JavaStackFrame;
+import javax.tools.diagnostics.java.JavaThread;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.JavaRuntimeVisitor;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java Fri Jul 10 23:03:33 2009
@@ -17,12 +17,13 @@
 import java.util.List;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
-import org.apache.kato.image.KatoException;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaField;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaField;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.JavaClassVisitor;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java Fri Jul 10 23:03:33 2009
@@ -16,11 +16,12 @@
 import java.util.HashMap;
 import java.util.Stack;
 
-import org.apache.kato.image.Image;
-import org.apache.kato.image.KatoException;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaField;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaField;
+import javax.tools.diagnostics.java.JavaRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.JavaClassVisitor;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XDCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XDCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XDCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XDCommand.java Fri Jul 10 23:03:33 2009
@@ -17,11 +17,12 @@
 import java.util.Stack;
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImagePointer;
-import org.apache.kato.image.MemoryAccessException;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.image.MemoryAccessException;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Utils;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java Fri Jul 10 23:03:33 2009
@@ -17,18 +17,19 @@
 import java.util.Stack;
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.Image;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaHeap;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaRuntime;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaHeap;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.ManagedRuntime;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.ClassOutput;
 import org.apache.kato.katoview.commands.helpers.Exceptions;
 import org.apache.kato.katoview.commands.helpers.Utils;
-import org.apache.kato.runtime.ManagedRuntime;
 
 
 public class XJCommand extends Command {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XKCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XKCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XKCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XKCommand.java Fri Jul 10 23:03:33 2009
@@ -17,17 +17,18 @@
 import java.util.Stack;
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageModule;
-import org.apache.kato.image.ImagePointer;
-import org.apache.kato.image.ImageProcess;
-import org.apache.kato.image.ImageSection;
-import org.apache.kato.image.ImageSymbol;
-import org.apache.kato.image.MemoryAccessException;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageModule;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.image.ImageSymbol;
+import javax.tools.diagnostics.image.MemoryAccessException;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Exceptions;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XXCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XXCommand.java?rev=793139&r1=793138&r2=793139&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XXCommand.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XXCommand.java Fri Jul 10 23:03:33 2009
@@ -17,11 +17,12 @@
 import java.util.Stack;
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImagePointer;
-import org.apache.kato.image.MemoryAccessException;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.image.MemoryAccessException;
+
 import org.apache.kato.katoview.Output;
 import org.apache.kato.katoview.commands.Command;
 import org.apache.kato.katoview.commands.helpers.Utils;