incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r793142 [2/3] - in /incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite: ./ src/main/java/org/apache/kato/tck/tests/javaruntime/ src/main/java/org/apache/kato/tck/tests/process/ src/main/java/org/apache...
Date Fri, 10 Jul 2009 23:07:22 GMT
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.java Fri Jul 10 23:07:20 2009
@@ -15,11 +15,11 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.java.JavaLocation;
-import org.apache.kato.java.JavaRuntime;
-import org.apache.kato.java.JavaStackFrame;
-import org.apache.kato.java.JavaThread;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.java.JavaLocation;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.java.JavaStackFrame;
+import javax.tools.diagnostics.java.JavaThread;
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
 
@@ -93,7 +93,7 @@
 
 	public void setUp () {
 		JavaRuntime runtime = getJavaRuntime();
-		Iterator threads = runtime.getThreads();
+		Iterator threads = runtime.getThreads().iterator();
 		
 		while (threads.hasNext()) {
 			Object next = threads.next();
@@ -122,7 +122,7 @@
 	private JavaThread contrivedThread;
 
 	public void testGetStackFrames() throws Exception {
-		Iterator frames = contrivedThread.getStackFrames();
+		Iterator frames = contrivedThread.getStackFrames().iterator();
 		int methodIndex = 0;
 
 		while (frames.hasNext()) {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestEnvironmentVariables.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestEnvironmentVariables.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestEnvironmentVariables.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestEnvironmentVariables.java Fri Jul 10 23:07:20 2009
@@ -16,11 +16,11 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-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 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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 
@@ -112,7 +112,7 @@
 	private ImageProcess getProcess() {
 		
 		Image image=getImage();
-		Iterator addressIterator=image.getAddressSpaces();
+		Iterator addressIterator=image.getAddressSpaces().iterator();
 		ImageAddressSpace addressSpace=(ImageAddressSpace) addressIterator.next();
 		ImageProcess process=addressSpace.getCurrentProcess();
 		return process;

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestImage.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestImage.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestImage.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestImage.java Fri Jul 10 23:07:20 2009
@@ -13,7 +13,7 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.process;
 
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.Image;
 import org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageAddressSpace.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageAddressSpace.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageAddressSpace.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageAddressSpace.java Fri Jul 10 23:07:20 2009
@@ -15,9 +15,9 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageAddressSpace;
 import org.apache.kato.tck.harness.TCKProcessTestcase;
 
 
@@ -33,7 +33,7 @@
 	public void testAddressSpace() {
 
 		Image image=getImage();
-		Iterator addressSpaces = image.getAddressSpaces();
+		Iterator addressSpaces = image.getAddressSpaces().iterator();
 
 		while (addressSpaces.hasNext()) {
 			Object nextAddressSpace = addressSpaces.next();

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetCreationTime.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetCreationTime.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetCreationTime.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetCreationTime.java Fri Jul 10 23:07:20 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.process.image;
 
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
 import org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetHostName.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetHostName.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetHostName.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetHostName.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.process.image;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetIPAddresses.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetIPAddresses.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetIPAddresses.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetIPAddresses.java Fri Jul 10 23:07:20 2009
@@ -15,9 +15,9 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
 import org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetInstalledMemory.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetInstalledMemory.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetInstalledMemory.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetInstalledMemory.java Fri Jul 10 23:07:20 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.process.image;
 
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
 import org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorCount.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorCount.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorCount.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorCount.java Fri Jul 10 23:07:20 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.process.image;
 
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.Image;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
 import org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorSubType.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorSubType.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorSubType.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorSubType.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.process.image;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorType.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorType.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorType.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorType.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.process.image;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemSubType.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemSubType.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemSubType.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemSubType.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.process.image;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemType.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemType.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemType.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemType.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.process.image;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateAIXClassTag.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateAIXClassTag.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateAIXClassTag.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateAIXClassTag.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.tagvalidation;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateDumpTypeMethodTag.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateDumpTypeMethodTag.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateDumpTypeMethodTag.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateDumpTypeMethodTag.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.tagvalidation;
 
-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 org.apache.kato.tck.api.TCKConfiguration;
 import org.apache.kato.tck.harness.TCKProcessTestcase;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateLinuxClassTag.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateLinuxClassTag.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateLinuxClassTag.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateLinuxClassTag.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.tagvalidation;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOS390ClassTag.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOS390ClassTag.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOS390ClassTag.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOS390ClassTag.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.tagvalidation;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOSMethodTag.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOSMethodTag.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOSMethodTag.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOSMethodTag.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.tagvalidation;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateWindowsClassTag.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateWindowsClassTag.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateWindowsClassTag.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateWindowsClassTag.java Fri Jul 10 23:07:20 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.tagvalidation;
 
-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 org.apache.kato.tck.harness.TCKProcessTestcase;
 
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/AbstractDTFJTestcase.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/AbstractDTFJTestcase.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/AbstractDTFJTestcase.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/AbstractDTFJTestcase.java Fri Jul 10 23:07:20 2009
@@ -14,23 +14,24 @@
 package org.apache.kato.tests.junit;
 
 import java.util.Iterator;
+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.ImageFactory;
-import org.apache.kato.image.ImageModule;
-import org.apache.kato.image.ImageProcess;
-import org.apache.kato.image.ImageThread;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaClassLoader;
-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 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.ImageFactory;
+import javax.tools.diagnostics.image.ImageModule;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.image.ImageThread;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaClassLoader;
+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.java.JavaThread;
 import org.apache.kato.tck.harness.TCKProcessTestcase;
 import org.apache.kato.tests.junit.DTFJImageLoader.Capabilities;
 
@@ -48,7 +49,7 @@
 		Image image = defaultTestingImage();
 		
 		//TODO: come up with a good way to test each address space.  For now we will just grab the first one
-		return (ImageAddressSpace) image.getAddressSpaces().next();
+		return (ImageAddressSpace) image.getAddressSpaces().get(0);
 	}
 
 	/**
@@ -80,7 +81,7 @@
 		if(_module!=null)  return _module;
 		
 		ImageProcess proc = defaultImageProcess();
-		Iterator it = null;
+		List it = null;
 		
 		try {
 			it = proc.getLibraries();
@@ -93,7 +94,7 @@
 			//we have nothing to test so throw unimplemented so we know it isn't a real bug
 			throw new TestNotImplementedException();
 		}
-		_module=(ImageModule) it.next();
+		_module=(ImageModule) it.get(0);
 		return _module;
 	}
 
@@ -103,7 +104,7 @@
 
 	public JavaRuntime defaultJavaRuntime() {
 		JavaRuntime runtime = null;
-		Iterator it = defaultImageProcess().getRuntimes();
+		Iterator it = defaultImageProcess().getRuntimes().iterator();
 		
 		assertFalse(null == it);
 		while ((null == runtime) && (it.hasNext())) {
@@ -121,7 +122,7 @@
 	public JavaThread defaultJavaThread() {
 		JavaRuntime time = defaultJavaRuntime();
 		assertNotNull(time);
-		Iterator it = time.getThreads();
+		Iterator it = time.getThreads().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 		//threads without stack frames aren't very useful for testing so ignore them
@@ -129,15 +130,16 @@
 		JavaThread candidate = null;
 		do {
 			candidate = (JavaThread) it.next();
-		} while ((it.hasNext()) && (!candidate.getStackFrames().hasNext()));
+		} while ((it.hasNext()) && (!candidate.getStackFrames().iterator().hasNext()));
 		return candidate;
 	}
 
 	public JavaClassLoader defaultJavaClassLoader() {
-		Iterator loaders =  defaultJavaRuntime().getJavaClassLoaders();
+		Iterator loaders =  defaultJavaRuntime().getJavaClassLoaders().iterator();
 		assertTrue(loaders.hasNext());
 		JavaClassLoader loader = (JavaClassLoader) loaders.next();
-		while ((!loader.getDefinedClasses().hasNext()) && (loaders.hasNext())) {
+		Iterator i=loader.getDefinedClasses().iterator();
+		while ((!i.hasNext()) && (loaders.hasNext())) {
 			loader = (JavaClassLoader) loaders.next();
 		}
 		return loader;
@@ -149,7 +151,7 @@
 		
 		// Choose a class which has a superclass
 		try {
-			for (Iterator iter = loader.getDefinedClasses(); iter.hasNext();) {
+			for (Iterator iter = loader.getDefinedClasses().iterator(); iter.hasNext();) {
 				JavaClass clazz = (JavaClass) iter.next();
 				if ( !clazz.getName().equals("java/lang/Object") &&
 				     !clazz.getName().equals("boolean"         ) &&
@@ -176,7 +178,7 @@
 
 	public JavaHeap defaultJavaHeap() {
 		JavaRuntime runtime  = defaultJavaRuntime();
-		Iterator it = runtime.getHeaps();
+		Iterator it = runtime.getHeaps().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 		JavaHeap heap = (JavaHeap) it.next();
@@ -196,7 +198,7 @@
 	public JavaObject defaultJavaObject(boolean isArray) {
 		JavaObject foundObject = null;
 		JavaHeap heap = defaultJavaHeap();
-		Iterator objects = heap.getObjects();
+		Iterator objects = heap.getObjects().iterator();
 		
 		while ((null == foundObject) && (objects.hasNext())) {
 			JavaObject oneObject = (JavaObject) objects.next();
@@ -212,7 +214,7 @@
 				} else {
 					// We need a non-array, non-trivial object with at least two declared fields
 					if ( (!oneObject.isArray()) && (!oneObject.getJavaClass().getName().equals("java/lang/Object"))) {
-						Iterator declaredFields=oneObject.getJavaClass().getDeclaredFields();
+						Iterator declaredFields=oneObject.getJavaClass().getDeclaredFields().iterator();
 						if (declaredFields.hasNext()) {
 							declaredFields.next();
 							if (declaredFields.hasNext()) {
@@ -229,7 +231,7 @@
 	}
 
 	public ImageThread defaultImageThread() {
-		Iterator it = defaultImageProcess().getThreads();
+		Iterator it = defaultImageProcess().getThreads().iterator();
 		
 		assertNotNull(it);
 		assertTrue(it.hasNext());
@@ -250,7 +252,7 @@
 
 	public JavaMethod defaultJavaMethod() {
 		JavaRuntime runtime = defaultJavaRuntime();
-		Iterator it = runtime.getCompiledMethods();
+		Iterator it = runtime.getCompiledMethods().iterator();
 		if (it.hasNext()) {
 			return (JavaMethod) it.next();
 		} else {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJImageLoader.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJImageLoader.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJImageLoader.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJImageLoader.java Fri Jul 10 23:07:20 2009
@@ -14,8 +14,8 @@
 package org.apache.kato.tests.junit;
 
 
-import org.apache.kato.image.Image;
-import org.apache.kato.image.ImageFactory;
+import javax.tools.diagnostics.image.Image;
+import javax.tools.diagnostics.image.ImageFactory;
 import org.apache.kato.tck.api.IImageCreator;
 import org.apache.kato.tck.api.TCKConfiguration;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJManifestTests.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJManifestTests.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJManifestTests.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJManifestTests.java Fri Jul 10 23:07:20 2009
@@ -20,7 +20,7 @@
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
-import org.apache.kato.image.ImageFactory;
+import javax.tools.diagnostics.image.ImageFactory;
 
 import junit.framework.TestCase;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageAddressSpaceTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageAddressSpaceTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageAddressSpaceTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageAddressSpaceTest.java Fri Jul 10 23:07:20 2009
@@ -14,10 +14,11 @@
 package org.apache.kato.tests.junit;
 
 import java.util.Iterator;
+import java.util.List;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImageSection;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImageSection;
 
 
 public class ImageAddressSpaceTest extends AbstractDTFJTestcase {
@@ -30,7 +31,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageAddressSpace.getCurrentProcess()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageAddressSpace.getCurrentProcess()'
 	 * 
 	 * Ensures that the process is non-null
 	 */
@@ -39,19 +40,19 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageAddressSpace.getProcesses()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageAddressSpace.getProcesses()'
 	 * 
 	 * Ensures that the process iterator is non-null and has at least one process
 	 */
 	public void testGetProcesses() {
-		Iterator it = _space.getProcesses();
+		List it = _space.getProcesses();
 		
 		assertNotNull(it);
-		assertTrue(it.hasNext());
+		assertFalse(it.isEmpty());
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageAddressSpace.getPointer(long)'
+	 * Test method for 'javax.tools.diagnostics.image.ImageAddressSpace.getPointer(long)'
 	 * 
 	 * Ensures that pointers can be created which point at entities within the address space.
 	 * TODO:  this needs to be tested in a less arbitrary way.
@@ -61,13 +62,13 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.image.ImageAddressSpace.getImageSections()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageAddressSpace.getImageSections()'
 	 * 
 	 * Ensures that there is at least one section and it is of type ImageSection
 	 */
 	public void testGetImageSections()
 	{
-		Iterator it = _space.getImageSections();
+		Iterator it = _space.getImageSections().iterator();
 		assertTrue(it.hasNext());
 		// empty iterator is a valid return from getImageSections
 		while (it.hasNext()) {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageFactoryTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageFactoryTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageFactoryTest.java Fri Jul 10 23:07:20 2009
@@ -13,12 +13,12 @@
  ******************************************************************************/
 package org.apache.kato.tests.junit;
 
-import org.apache.kato.image.ImageFactory;
+import javax.tools.diagnostics.image.ImageFactory;
 
 public class ImageFactoryTest extends AbstractDTFJTestcase
 {
 	/**
-	 * Test method for 'org.apache.kato.image.ImageFactory.getDTFJMajorVersion()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageFactory.getDTFJMajorVersion()'
 	 * 
 	 * Ensures that the major version is at least 1
 	 */
@@ -28,7 +28,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageFactory.getDTFJMinorVersion()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageFactory.getDTFJMinorVersion()'
 	 * 
 	 * Ensures that the minor version is at least 0
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageModuleTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageModuleTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageModuleTest.java Fri Jul 10 23:07:20 2009
@@ -13,17 +13,19 @@
  ******************************************************************************/
 package org.apache.kato.tests.junit;
 
+
 import java.util.Iterator;
+import java.util.List;
 import java.util.Properties;
 
-import org.apache.kato.image.CorruptDataException;
+import javax.tools.diagnostics.image.CorruptDataException;
 
 
 public class ImageModuleTest extends AbstractDTFJTestcase {
 	
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageModule.getName()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageModule.getName()'
 	 * 
 	 * Ensures that the name is non-null
 	 */
@@ -36,32 +38,32 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageModule.getSections()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageModule.getSections()'
 	 * 
 	 * Ensures that the sections iterator is non-null and non-empty
 	 */
 	public void testGetSections() {
-		Iterator it = defaultImageModule().getSections();
+		List it = defaultImageModule().getSections();
 		
 		assertNotNull(it);
-		assertTrue(it.hasNext());
+		assertFalse(it.isEmpty());
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageModule.getSymbols()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageModule.getSymbols()'
 	 * 
 	 * Ensures that symbols exist in the module
 	 * 
 	 */
 	public void testGetSymbols() {
-		Iterator it = defaultImageModule().getSymbols();
+		List it = defaultImageModule().getSymbols();
 		
 		assertNotNull(it);
-		assertTrue(it.hasNext());
+		assertFalse(it.isEmpty());
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageModule.getProperties()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageModule.getProperties()'
 	 * 
 	 * Ensures that the module has a properties structure
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImagePointerTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImagePointerTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImagePointerTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImagePointerTest.java Fri Jul 10 23:07:20 2009
@@ -13,11 +13,11 @@
  ******************************************************************************/
 package org.apache.kato.tests.junit;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-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.DataUnavailable;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.image.MemoryAccessException;
 
 public class ImagePointerTest extends AbstractDTFJTestcase
 {
@@ -41,7 +41,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.getAddress()'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.getAddress()'
 	 * 
 	 * Ensure that the address is what we created it with
 	 */
@@ -51,7 +51,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.getAddressSpace()'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.getAddressSpace()'
 	 * 
 	 * Ensures that the parent address space is equal to the one we used to create it
 	 */
@@ -61,7 +61,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.add(long)'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.add(long)'
 	 * 
 	 * Ensures that adding an offset yields a pointer at the expected address
 	 */
@@ -72,7 +72,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.isExecutable()'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.isExecutable()'
 	 * 
 	 * Ensures that the method can be called
 	 */
@@ -86,7 +86,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.isReadOnly()'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.isReadOnly()'
 	 * 
 	 * Ensures that the method can be called
 	 */
@@ -100,7 +100,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.isShared()'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.isShared()'
 	 * 
 	 * Ensures that the method can be called
 	 */
@@ -114,7 +114,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.getPointerAt(long)'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.getPointerAt(long)'
 	 * 
 	 * Ensure that we can read a pointer at the given address without throwing anything unexpected
 	 */
@@ -131,7 +131,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.getLongAt(long)'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.getLongAt(long)'
 	 * 
 	 * Ensure that we can read a long at the given address without throwing anything unexpected
 	 */
@@ -148,7 +148,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.getIntAt(long)'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.getIntAt(long)'
 	 * 
 	 * Ensure that we can read an int at the given address without throwing anything unexpected
 	 */
@@ -165,7 +165,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.getShortAt(long)'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.getShortAt(long)'
 	 * 
 	 * Ensure that we can read a short at the given address without throwing anything unexpected
 	 */
@@ -182,7 +182,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.getByteAt(long)'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.getByteAt(long)'
 	 * 
 	 * Ensure that we can read a byte at the given address without throwing anything unexpected
 	 */
@@ -199,7 +199,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.getFloatAt(long)'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.getFloatAt(long)'
 	 * 
 	 * Ensure that we can read a float at the given address without throwing anything unexpected
 	 */
@@ -216,7 +216,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImagePointer.getDoubleAt(long)'
+	 * Test method for 'javax.tools.diagnostics.image.ImagePointer.getDoubleAt(long)'
 	 * 
 	 * Ensure that we can read a double at the given address without throwing anything unexpected
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageProcessTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageProcessTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageProcessTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageProcessTest.java Fri Jul 10 23:07:20 2009
@@ -16,13 +16,14 @@
 import java.util.Iterator;
 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.ImageProcess;
-import org.apache.kato.image.ImageThread;
-import org.apache.kato.runtime.ManagedRuntime;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.KatoException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.ImageProcess;
+import javax.tools.diagnostics.image.ImageThread;
+import javax.tools.diagnostics.runtime.ManagedRuntime;
+
 
 
 public class ImageProcessTest extends AbstractDTFJTestcase {
@@ -35,7 +36,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.image.ImageProcess.getCommandLine()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getCommandLine()'
 	 */
 	public void testGetCommandLine()
 	{
@@ -48,7 +49,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getEnvironment()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getEnvironment()'
 	 * 
 	 * Ensures that the properties are non-null
 	 */
@@ -65,7 +66,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getID()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getID()'
 	 * 
 	 * Ensures that the process ID is non-null and non-empty
 	 */
@@ -83,7 +84,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getLibraries()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getLibraries()'
 	 * 
 	 * Make sure that the libraries iterator is non-null
 	 */
@@ -99,7 +100,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getExecutable()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getExecutable()'
 	 * 
 	 * Make sure that the module is non-null
 	 */
@@ -116,13 +117,13 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getThreads()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getThreads()'
 	 * 
 	 * Ensures that there is at least one thread and it is an instance of ImageThread or CorruptData
 	 */
 	public void testGetThreads()
 	{
-		Iterator threads = _proc.getThreads();
+		Iterator threads = _proc.getThreads().iterator();
 		assertNotNull(threads);
 		assertTrue(threads.hasNext());
 		Object instance = threads.next();
@@ -130,7 +131,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getCurrentThread()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getCurrentThread()'
 	 * 
 	 * Ensures that anything (even null) is returned or the correct exception is thrown
 	 */
@@ -144,13 +145,13 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getRuntimes()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getRuntimes()'
 	 * 
 	 * Ensures that at least one runtime is returned and that it is an instance of ManagedRuntime or CorruptData
 	 */
 	public void testGetRuntimes()
 	{
-		Iterator runtimes = _proc.getRuntimes();
+		Iterator runtimes = _proc.getRuntimes().iterator();
 		assertNotNull(runtimes);
 		assertTrue(runtimes.hasNext());
 		Object instance = runtimes.next();
@@ -158,7 +159,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getSignalNumber()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getSignalNumber()'
 	 * 
 	 * Ensures that no unexpected exceptions are thrown
 	 */
@@ -174,7 +175,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getSignalName()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getSignalName()'
 	 * 
 	 * Ensures that anything (even null) is returned or the correct exceptions are thrown
 	 */
@@ -190,7 +191,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageProcess.getPointerSize()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageProcess.getPointerSize()'
 	 * 
 	 * This should return 31, 32, or 64
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageRegisterTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageRegisterTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageRegisterTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageRegisterTest.java Fri Jul 10 23:07:20 2009
@@ -15,8 +15,8 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.ImageRegister;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.ImageRegister;
 
 public class ImageRegisterTest extends AbstractDTFJTestcase
 {
@@ -26,7 +26,7 @@
 	{
 		// if getRegisters() returns an empty iterator (which is valid)
 		// then defaultImageRegisters returns null
-		Iterator theR = defaultImageThread().getRegisters();
+		Iterator theR = defaultImageThread().getRegisters().iterator();
 		ImageRegister theIR = null;
 		while (theR.hasNext()){
 			theIR = (ImageRegister) theR.next();
@@ -41,7 +41,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageRegister.getName()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageRegister.getName()'
 	 * 
 	 * Ensures that the register has a non-null non-empty name
 	 */
@@ -57,7 +57,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageRegister.toString()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageRegister.toString()'
 	 * 
 	 */
 	public void testToString()
@@ -74,7 +74,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageRegister.getValue()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageRegister.getValue()'
 	 * 
 	 * Ensures that we can make the call without unexpected exceptions occurring
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java Fri Jul 10 23:07:20 2009
@@ -15,9 +15,9 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.ImageSection;
-import org.apache.kato.java.JavaMethod;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.java.JavaMethod;
 
 
 public class ImageSectionTest extends AbstractDTFJTestcase
@@ -28,7 +28,7 @@
 	{
 		//for now we will just grab a compiled method section
 		JavaMethod method = defaultJavaMethod();
-		Iterator it = method.getCompiledSections();
+		Iterator it = method.getCompiledSections().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 		return (ImageSection) it.next();
@@ -42,7 +42,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageSection.getBaseAddress()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageSection.getBaseAddress()'
 	 * 
 	 * Ensure that we get a non-null base address
 	 */
@@ -52,7 +52,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageSection.getSize()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageSection.getSize()'
 	 * 
 	 * Ensure that we get a >0 size
 	 */
@@ -62,7 +62,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageSection.getName()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageSection.getName()'
 	 * 
 	 * Ensure that we get a non-null name
 	 */
@@ -72,7 +72,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageSection.isExecutable()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageSection.isExecutable()'
 	 * 
 	 * Ensures that the method can be called
 	 */
@@ -86,7 +86,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageSection.isReadOnly()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageSection.isReadOnly()'
 	 * 
 	 * Ensures that the method can be called
 	 */
@@ -100,7 +100,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageSection.isShared()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageSection.isShared()'
 	 * 
 	 * Ensures that the method can be called
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageStackFrameTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageStackFrameTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageStackFrameTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageStackFrameTest.java Fri Jul 10 23:07:20 2009
@@ -15,11 +15,11 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.ImagePointer;
-import org.apache.kato.image.ImageStackFrame;
-import org.apache.kato.image.ImageThread;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.image.ImageStackFrame;
+import javax.tools.diagnostics.image.ImageThread;
 
 
 public class ImageStackFrameTest extends AbstractDTFJTestcase
@@ -32,12 +32,12 @@
 //			return (ImageStackFrame) defaultImageThread().getStackFrames().next();
 //		} catch (DataUnavailable e) {
 			// Try harder to find a thread with a stack.
-			Iterator it = defaultImageProcess().getThreads();
+			Iterator it = defaultImageProcess().getThreads().iterator();
 			while (it.hasNext()) {
 				ImageThread thread = (ImageThread) it.next();
 				try {
-					if (thread.getStackFrames().hasNext()) {
-						return (ImageStackFrame) thread.getStackFrames().next();
+					if (thread.getStackFrames().isEmpty()==false) {
+						return (ImageStackFrame) thread.getStackFrames().get(0);
 					}
 				} catch (DataUnavailable e1) {
 					// Ignore
@@ -55,7 +55,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageStackFrame.getProcedureAddress()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageStackFrame.getProcedureAddress()'
 	 * 
 	 * Ensures that we get a non-null address
 	 */
@@ -70,7 +70,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageStackFrame.getBasePointer()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageStackFrame.getBasePointer()'
 	 * 
 	 * Ensures that we get a non-null base pointer
 	 */
@@ -86,7 +86,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageStackFrame.getProcedureName()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageStackFrame.getProcedureName()'
 	 * 
 	 * Ensures that we get a non-null, non-empty name
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSymbolTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSymbolTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSymbolTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSymbolTest.java Fri Jul 10 23:07:20 2009
@@ -15,8 +15,8 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.ImagePointer;
-import org.apache.kato.image.ImageSymbol;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.image.ImageSymbol;
 
 
 public class ImageSymbolTest extends AbstractDTFJTestcase
@@ -25,7 +25,7 @@
 	
 	public  ImageSymbol defaultImageSymbol()
 	{
-		Iterator symbols = defaultImageModule().getSymbols();
+		Iterator symbols = defaultImageModule().getSymbols().iterator();
 		if(symbols.hasNext()) {
 			return (ImageSymbol) symbols.next();
 		} else {		
@@ -40,7 +40,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageSymbol.getAddress()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageSymbol.getAddress()'
 	 * Ensures that the address is non-null
 	 */
 	public void testGetAddress()
@@ -51,7 +51,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageSymbol.getName()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageSymbol.getName()'
 	 * Ensures that the name is non-null and non-empty
 	 */
 	public void testGetName()

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageTest.java Fri Jul 10 23:07:20 2009
@@ -14,11 +14,12 @@
 package org.apache.kato.tests.junit;
 
 import java.util.Iterator;
+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 javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.Image;
 
 
 /**
@@ -48,10 +49,10 @@
 	 * ensure that the core has non-null address spaces and at least one
 	 */
 	public void testGetAddressSpaces() {
-		Iterator it = _core.getAddressSpaces();
+		List it = _core.getAddressSpaces();
 		
 		assertNotNull(it);
-		assertTrue(it.hasNext());
+		assertFalse(it.isEmpty());
 	}
 	
 	/**

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageThreadTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageThreadTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageThreadTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageThreadTest.java Fri Jul 10 23:07:20 2009
@@ -15,12 +15,12 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.DataUnavailable;
-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 javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.ImageRegister;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.image.ImageStackFrame;
+import javax.tools.diagnostics.image.ImageThread;
 
 
 public class ImageThreadTest extends AbstractDTFJTestcase
@@ -35,7 +35,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.image.ImageThread.getID()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageThread.getID()'
 	 */
 	public void testGetID()
 	{
@@ -49,7 +49,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageThread.getStackFrames()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageThread.getStackFrames()'
 	 * 
 	 * Ensures that a non-null iterator is returned with at lzero or more elements
 	 * of type ImageStackFrame or CorruptData.
@@ -58,7 +58,7 @@
 	public void testGetStackFrames()
 	{
 		try {
-			Iterator frames = _thread.getStackFrames();
+			Iterator frames = _thread.getStackFrames().iterator();
 			
 			assertNotNull(frames);
 			while (frames.hasNext()) {
@@ -71,13 +71,13 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageThread.getStackSections()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageThread.getStackSections()'
 	 * 
 	 * Ensures that at least one stack section exists
 	 */
 	public void testGetStackSections()
 	{
-		Iterator it = _thread.getStackSections();
+		Iterator it = _thread.getStackSections().iterator();
 		assertNotNull(it);
 		// empty iterator is a valid return from getStackFrames
 		while (it.hasNext()) {
@@ -87,14 +87,14 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageThread.getRegisters()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageThread.getRegisters()'
 	 * 
 	 * Ensures that a non-null, non-empty iterator is returned and all instances
 	 * are of type ImageRegister
 	 */
 	public void testGetRegisters()
 	{
-		Iterator regs = _thread.getRegisters();
+		Iterator regs = _thread.getRegisters().iterator();
 		
 		assertNotNull(regs);
 		// Empty iterator is a valid return from getRegisters
@@ -106,7 +106,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.image.ImageThread.getProperties()'
+	 * Test method for 'javax.tools.diagnostics.image.ImageThread.getProperties()'
 	 * 
 	 * Ensures that non-null properties are returned
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassLoaderTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassLoaderTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassLoaderTest.java Fri Jul 10 23:07:20 2009
@@ -15,10 +15,10 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.java.JavaClass;
-import org.apache.kato.java.JavaClassLoader;
-import org.apache.kato.java.JavaObject;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.java.JavaClass;
+import javax.tools.diagnostics.java.JavaClassLoader;
+import javax.tools.diagnostics.java.JavaObject;
 
 
 public class JavaClassLoaderTest extends AbstractDTFJTestcase
@@ -37,7 +37,7 @@
 	 */
 	public void testGetDefinedClasses()
 	{
-		Iterator iter = _loader.getDefinedClasses();
+		Iterator iter = _loader.getDefinedClasses().iterator();
 		assertNotNull(iter);
 	}
 
@@ -46,7 +46,7 @@
 	 */
 	public void testGetCachedClasses()
 	{
-		Iterator iter = _loader.getCachedClasses();
+		Iterator iter = _loader.getCachedClasses().iterator();
 		assertNotNull(iter);
 	}
 
@@ -56,7 +56,7 @@
 	 */
 	public void testFindClass()
 	{
-		JavaClass oneClass = (JavaClass) _loader.getDefinedClasses().next();
+		JavaClass oneClass = (JavaClass) _loader.getDefinedClasses().get(0);
 		try {
 			String name = oneClass.getName();
 			JavaClass foundClass = _loader.findClass(name);

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassTest.java Fri Jul 10 23:07:20 2009
@@ -15,17 +15,19 @@
 
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
+
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.ImagePointer;
+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.JavaMethod;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaReference;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.ImagePointer;
-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.JavaMethod;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaReference;
 import org.apache.kato.tests.scenarios.ArrayletTest;
 
 
@@ -72,7 +74,7 @@
 
 	
 	/*
-	 * Test method for 'org.apache.kato.java.JavaClass.getObject()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getObject()'
 	 */
 	public void testGetObject()
 	{
@@ -93,7 +95,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaClass.getClassLoader()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getClassLoader()'
 	 */
 	public void testGetClassLoader()
 	{
@@ -109,7 +111,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaClass.getName()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getName()'
 	 */
 	public void testGetName()
 	{
@@ -125,7 +127,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaClass.getSuperclass()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getSuperclass()'
 	 */
 	public void testGetSuperclass()
 	{
@@ -141,12 +143,12 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaClass.getInterfaces()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getInterfaces()'
 	 */
 	public void testGetInterfaces()
 	{
 		try {
-			Iterator iter = _testClass.getInterfaces();
+			List iter = _testClass.getInterfaces();
 			assertNotNull(iter);
 		} catch (Exception e) {
 			//if we caught anything else, this is an error
@@ -155,7 +157,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaClass.getModifiers()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getModifiers()'
 	 */
 	public void testGetModifiers()
 	{
@@ -171,7 +173,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaClass.isArray()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.isArray()'
 	 */
 	public void testIsArray()
 	{
@@ -187,7 +189,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaClass.getComponentType()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getComponentType()'
 	 * 
 	 * Ensures that we get a non-null component type which has a non-null, non-empty length
 	 */
@@ -213,7 +215,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaClass.getDeclaredFields()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getDeclaredFields()'
 	 * 
 	 * Ensures that we get a non-null iterator and anything in the iterator is an instance
 	 * of JavaField or CorruptData
@@ -221,7 +223,7 @@
 	public void testGetDeclaredFields()
 	{
 		try {
-			Iterator fields = _testClass.getDeclaredFields();
+			Iterator fields = _testClass.getDeclaredFields().iterator();
 			assertNotNull(fields);
 			while (fields.hasNext()) {
 				Object element = fields.next();
@@ -234,7 +236,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaClass.getDeclaredMethods()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getDeclaredMethods()'
 	 * 
 	 * Ensures that the declared methods iterator is non-null and any methods in it
 	 * are either JavaMethod or CorruptData
@@ -242,7 +244,7 @@
 	public void testGetDeclaredMethods()
 	{
 		try {
-			Iterator methods = _testClass.getDeclaredMethods();
+			Iterator methods = _testClass.getDeclaredMethods().iterator();
 			assertNotNull(methods);
 			while (methods.hasNext()) {
 				Object instance = methods.next();
@@ -255,7 +257,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaClass.getConstantPoolReferences()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getConstantPoolReferences()'
 	 * 
 	 * Ensures that the test class returns a non-null iterator and that any elements
 	 * in it are either JavaObject or CorruptData
@@ -263,7 +265,7 @@
 	public void testGetConstantPoolReferences()
 	{
 		try {
-			Iterator references = _testClass.getConstantPoolReferences();
+			Iterator references = _testClass.getConstantPoolReferences().iterator();
 			assertNotNull(references);
 			while (references.hasNext()) {
 				Object instance = references.next();
@@ -282,7 +284,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaClass.getID()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getID()'
 	 * 
 	 * Ensures that the pointer is non-null and that the underlying address is non-zero
 	 */
@@ -299,7 +301,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaClass.getReferences()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.getReferences()'
 	 * 
 	 * Ensures that the test class returns a non-null iterator, that any elements in it are 
 	 * either JavaReference or CorruptData, and that any JavaReference objects have a non-null 
@@ -308,7 +310,7 @@
 	public void testGetReferences()
 	{
 		try {
-			Iterator references = _testClass.getReferences();
+			Iterator references = _testClass.getReferences().iterator();
 			assertNotNull(references);
 			while (references.hasNext()) {
 				Object instance = references.next();
@@ -378,10 +380,10 @@
 				throw new TestNotImplementedException();
 			}
 			//now make sure that none of the fields in subclass are in superclass
-			Iterator subfields = subclass.getDeclaredFields();
+			Iterator subfields = subclass.getDeclaredFields().iterator();
 			while (subfields.hasNext()) {
 				Object subtest = subfields.next();
-				Iterator superfields = superclass.getDeclaredFields();
+				Iterator superfields = superclass.getDeclaredFields().iterator();
 				
 				while (superfields.hasNext()) {
 					Object supertest = superfields.next();
@@ -399,11 +401,11 @@
 
 	private JavaClass _findClassForName(String candidateClass)
 	{
-		Iterator allLoaders = defaultJavaRuntime().getJavaClassLoaders();
+		Iterator allLoaders = defaultJavaRuntime().getJavaClassLoaders().iterator();
 		JavaClass subclass = null;
 		while (allLoaders.hasNext() && (null == subclass)) {
 			JavaClassLoader loader = (JavaClassLoader) allLoaders.next();
-			Iterator classes = loader.getDefinedClasses();
+			Iterator classes = loader.getDefinedClasses().iterator();
 			while (classes.hasNext()  && (null == subclass)) {
 				JavaClass oneClass = (JavaClass) classes.next();
 				try {
@@ -433,7 +435,7 @@
 		if (null != candidateClass) {
 			int size = 0;
 			JavaObject container = null;
-			Iterator fields = candidateClass.getDeclaredFields();
+			Iterator fields = candidateClass.getDeclaredFields().iterator();
 			
 			try {
 				while (fields.hasNext()) {
@@ -450,7 +452,7 @@
 				if ((0 != size) && (null != container)) {
 					//now, pull apart the fields of the container
 					JavaClass containerClass = container.getJavaClass();
-					Iterator theseFields = containerClass.getDeclaredFields();
+					Iterator theseFields = containerClass.getDeclaredFields().iterator();
 					while (theseFields.hasNext()) {
 						JavaField oneField = (JavaField) theseFields.next();
 						if (oneField.getName().equals("DTFJ_ARRAYLET_INTS")) {
@@ -481,7 +483,7 @@
 							JavaObject whole[] = new JavaObject[size];
 							array.arraycopy(0, whole, 0, size);
 							JavaField stringField = null;
-							Iterator iter = whole[0].getJavaClass().getDeclaredFields();
+							Iterator iter = whole[0].getJavaClass().getDeclaredFields().iterator();
 							while(iter.hasNext()) {
 								JavaField testField = (JavaField) iter.next();
 								if (testField.getName().equals("_stringField")) {
@@ -519,7 +521,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaClass.toString()' 
+	 * Test method for 'javax.tools.diagnostics.java.JavaClass.toString()' 
 	 * 
 	 */
 	public void testToString()

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaFieldTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaFieldTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaFieldTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaFieldTest.java Fri Jul 10 23:07:20 2009
@@ -15,12 +15,12 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptDataException;
-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 javax.tools.diagnostics.image.CorruptDataException;
+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;
 
 
 public class JavaFieldTest extends AbstractDTFJTestcase
@@ -31,14 +31,14 @@
 
 	public static JavaField defaultJavaField(JavaClass clazz)
 	{
-		return (JavaField) clazz.getDeclaredFields().next();
+		return (JavaField) clazz.getDeclaredFields().get(0);
 	}
 	
 	protected void setUp() throws Exception
 	{
 		try {
 			_testInstance = defaultJavaObject(false);
-			Iterator declaredFields=_testInstance.getJavaClass().getDeclaredFields();
+			Iterator declaredFields=_testInstance.getJavaClass().getDeclaredFields().iterator();
 			_field = (JavaField)declaredFields.next(); //guaranteed to exist - see JavaObjectTest#defaultJavaObject()
 			_anotherField=(JavaField)declaredFields.next(); //guaranteed to exist - see JavaObjectTest#defaultJavaObject()
 			super.setUp();
@@ -52,7 +52,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.get(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.get(JavaObject)'
 	 * 
 	 * This test will fail if a runtime exception is thrown (i.e. if _field does not represent a proper field of _testInstance)
 	 */
@@ -67,7 +67,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.getBoolean(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.getBoolean(JavaObject)'
 	 * 
 	 * Ensures that we succeed or get expected exceptions
 	 */
@@ -83,7 +83,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.getByte(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.getByte(JavaObject)'
 	 * 
 	 * Ensures that we succeed or get expected exceptions
 	 */
@@ -99,7 +99,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.getChar(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.getChar(JavaObject)'
 	 * 
 	 * Ensures that we succeed or get expected exceptions
 	 */
@@ -115,7 +115,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.getDouble(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.getDouble(JavaObject)'
 	 * 
 	 * Ensures that we succeed or get expected exceptions
 	 */
@@ -131,7 +131,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.getFloat(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.getFloat(JavaObject)'
 	 * 
 	 * Ensures that we succeed or get expected exceptions
 	 */
@@ -147,7 +147,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.getInt(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.getInt(JavaObject)'
 	 * 
 	 * Ensures that we succeed or get expected exceptions
 	 */
@@ -163,7 +163,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.getLong(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.getLong(JavaObject)'
 	 * 
 	 * Ensures that we succeed or get expected exceptions
 	 */
@@ -179,7 +179,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.getShort(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.getShort(JavaObject)'
 	 * 
 	 * Ensures that we succeed or get expected exceptions
 	 */
@@ -195,7 +195,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaField.getString(JavaObject)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaField.getString(JavaObject)'
 	 * 
 	 * Ensures that we succeed or get expected exceptions
 	 */
@@ -245,12 +245,12 @@
 	public void testJavaStaticFieldDouble()
 	{
 		JavaClass math = null;
-		Iterator loaders = defaultJavaRuntime().getJavaClassLoaders();
+		Iterator loaders = defaultJavaRuntime().getJavaClassLoaders().iterator();
 		
 		while (loaders.hasNext()) {
 			JavaClassLoader loader = (JavaClassLoader) loaders.next();
 			try {
-				for (Iterator iter = loader.getDefinedClasses(); iter.hasNext();) {
+				for (Iterator iter = loader.getDefinedClasses().iterator(); iter.hasNext();) {
 					JavaClass clazz = (JavaClass) iter.next();
 					if (clazz.getName().equals("java/lang/Math")) {
 						math = clazz;
@@ -263,7 +263,7 @@
 		}
 		
 		if (null != math) {
-			Iterator fields = math.getDeclaredFields();
+			Iterator fields = math.getDeclaredFields().iterator();
 			while (fields.hasNext()) {
 				JavaField field = (JavaField) fields.next();
 				try {

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaHeapTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaHeapTest.java?rev=793142&r1=793141&r2=793142&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaHeapTest.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaHeapTest.java Fri Jul 10 23:07:20 2009
@@ -14,8 +14,9 @@
 package org.apache.kato.tests.junit;
 
 import java.util.Iterator;
+import java.util.List;
 
-import org.apache.kato.java.JavaHeap;
+import javax.tools.diagnostics.java.JavaHeap;
 
 
 public class JavaHeapTest extends AbstractDTFJTestcase
@@ -29,19 +30,19 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaHeap.getSections()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaHeap.getSections()'
 	 * 
 	 * Ensure that the heap has at least one section
 	 */
 	public void testGetSections()
 	{
-		Iterator iter = _heap.getSections();
+		List iter = _heap.getSections();
 		assertNotNull(iter);
-		assertTrue(iter.hasNext());
+		assertFalse(iter.isEmpty());
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaHeap.getName()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaHeap.getName()'
 	 * 
 	 * Ensure that the heap has a non-empty name
 	 */
@@ -53,13 +54,13 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaHeap.getObjects()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaHeap.getObjects()'
 	 * 
 	 * Ensure that we return a non-empty iterator
 	 */
 	public void testGetObjects()
 	{
-		Iterator it = _heap.getObjects();
+		Iterator it = _heap.getObjects().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 	}



Mime
View raw message