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/05/28 10:35:21 UTC

svn commit: r779548 - in /incubator/kato/branches/experimental/maven_restructure/org.apache.kato: ./ kato.api/src/main/java/org/apache/kato/java/ kato.jdi/ kato.jvmti/ kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/ plugins/kato.api.plugin/ plug...

Author: spoole
Date: Thu May 28 10:35:21 2009
New Revision: 779548

URL: http://svn.apache.org/viewvc?rev=779548&view=rev
Log:
made kato jdi feature in experimental branch buildable by maven

Added:
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/SimpleImagePointer.java
Modified:
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.api/src/main/java/org/apache/kato/java/JavaStackFrame.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.classpath
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.project
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/.classpath
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/BinReader.java
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.settings/org.eclipse.jdt.core.prefs
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.xml
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.explorer.plugin/.classpath
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/pom.xml

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.api/src/main/java/org/apache/kato/java/JavaStackFrame.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.api/src/main/java/org/apache/kato/java/JavaStackFrame.java?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.api/src/main/java/org/apache/kato/java/JavaStackFrame.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.api/src/main/java/org/apache/kato/java/JavaStackFrame.java Thu May 28 10:35:21 2009
@@ -52,6 +52,7 @@
 	List getHeapRoots();                      
 
 	/**
+	 * 
 	 * Gets the value of a variable from a stack frame.
 	 * Returns a {@link JavaObject} for an object reference, null for a null object reference. Primitives are returned as boxed primitives.
 	 * throws CorruptDataException if object reference is incorrect, or if the float or double are set to invalid values.
@@ -59,11 +60,22 @@
 	 * @throws DataUnavailable if this method is not supported or if stack not in correct state to return variables.
 	 * @throws IndexOutOfBoundsException if an invalid slot number if passed.
 	 * 
+	 * @experimental this addition to the API is experimental and subject to change
 	 */
 
 	Object getVariable(int slot) throws CorruptDataException, DataUnavailable, IndexOutOfBoundsException;
 
 	/**
+	 * Gets all variables from the stack frame.
+	 * Returns a {@link java.util.List} containing the available {@link #JavaVariable} 
+	 *
+	 *@experimental this addition to the API is experimental and subject to change
+	 * 
+	 */
+
+	List getVariables(); 
+
+	/**
 	 * @param obj
 	 * @return True if the given object refers to the same JavaStackFrame in the image
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.classpath?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.classpath (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.classpath Thu May 28 10:35:21 2009
@@ -6,5 +6,6 @@
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.project
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.project?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.project (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/.project Thu May 28 10:35:21 2009
@@ -15,9 +15,20 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/.classpath?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/.classpath (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/.classpath Thu May 28 10:35:21 2009
@@ -6,6 +6,6 @@
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="lib" path="target/kato.jvmti-0.0.1-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="target/kato.jvmti-0.0.1-SNAPSHOT.jar" sourcepath="src/main/java"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/BinReader.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/BinReader.java?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/BinReader.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/BinReader.java Thu May 28 10:35:21 2009
@@ -34,6 +34,7 @@
 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.JavaMonitor;
@@ -250,7 +251,7 @@
 		if(monitorid==0) return null;
 		JMonitor m=(JMonitor) monitorsMap.get(monitorid);
 		if(m==null) {
-			m=new JMonitor();
+			m=new JMonitor(monitorid);
 			monitorsMap.put(monitorid,m);
 		}
 		return m;
@@ -577,7 +578,14 @@
 	
 	class JMonitor implements JavaMonitor {
 
+		private JThread owner=null;
+		private int id=0;
+		
 		List<JavaThread> waiters=new LinkedList<JavaThread>();
+		public JMonitor(int monitorid) {
+			this.id=monitorid;
+		}
+
 		@Override
 		public List getEnterWaiters() {
 			
@@ -591,8 +599,8 @@
 
 		@Override
 		public ImagePointer getID() {
-			// TODO Auto-generated method stub
-			return null;
+			return new SimpleImagePointer(id);
+			
 		}
 
 		@Override
@@ -609,14 +617,88 @@
 
 		@Override
 		public JavaObject getObject() {
-			// TODO Auto-generated method stub
-			return null;
+			
+			return new JavaObject(){
+
+				@Override
+				public void arraycopy(int srcStart, Object dst, int dstStart,
+						int length) throws CorruptDataException,
+						MemoryAccessException {
+					// TODO Auto-generated method stub
+					
+				}
+
+				@Override
+				public int getArraySize() throws CorruptDataException {
+					// TODO Auto-generated method stub
+					return 0;
+				}
+
+				@Override
+				public long getHashcode() throws DataUnavailable,
+						CorruptDataException {
+					// TODO Auto-generated method stub
+					return 0;
+				}
+
+				@Override
+				public JavaHeap getHeap() throws CorruptDataException,
+						DataUnavailable {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				public ImagePointer getID() {
+					return new SimpleImagePointer(id);
+				}
+
+				@Override
+				public JavaClass getJavaClass() throws CorruptDataException {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				public long getPersistentHashcode() throws DataUnavailable,
+						CorruptDataException {
+					// TODO Auto-generated method stub
+					return 0;
+				}
+
+				@Override
+				public List getReferences() {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				public List getSections() {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				public long getSize() throws CorruptDataException {
+					// TODO Auto-generated method stub
+					return 0;
+				}
+
+				@Override
+				public boolean isArray() throws CorruptDataException {
+					// TODO Auto-generated method stub
+					return false;
+				}};
 		}
 
 		@Override
 		public JavaThread getOwner() throws CorruptDataException {
-			// TODO Auto-generated method stub
-			return null;
+			return owner;
+		}
+
+		public void setOwner(JThread thread) {
+			this.owner=thread;
+			
 		}
 		
 	}
@@ -644,7 +726,7 @@
 				monitors=new LinkedList<JavaMonitor>();
 				
 			}
-			
+			mon.setOwner(this);
 			monitors.add(mon);
 			
 			
@@ -667,7 +749,79 @@
 		@Override
 		public JavaObject getObject() throws CorruptDataException {
 			
-			return null;
+			return new JavaObject(){
+
+				@Override
+				public void arraycopy(int srcStart, Object dst, int dstStart,
+						int length) throws CorruptDataException,
+						MemoryAccessException {
+					// TODO Auto-generated method stub
+					
+				}
+
+				@Override
+				public int getArraySize() throws CorruptDataException {
+					// TODO Auto-generated method stub
+					return 0;
+				}
+
+				@Override
+				public long getHashcode() throws DataUnavailable,
+						CorruptDataException {
+					// TODO Auto-generated method stub
+					return 0;
+				}
+
+				@Override
+				public JavaHeap getHeap() throws CorruptDataException,
+						DataUnavailable {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				public ImagePointer getID() {
+					return new SimpleImagePointer(id);
+				}
+
+				@Override
+				public JavaClass getJavaClass() throws CorruptDataException {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				public long getPersistentHashcode() throws DataUnavailable,
+						CorruptDataException {
+					// TODO Auto-generated method stub
+					return 0;
+				}
+
+				@Override
+				public List getReferences() {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				public List getSections() {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				public long getSize() throws CorruptDataException {
+					// TODO Auto-generated method stub
+					return 0;
+				}
+
+				@Override
+				public boolean isArray() throws CorruptDataException {
+					// TODO Auto-generated method stub
+					return false;
+				}};
+			
+			
 		}
 		@Override
 		public int getPriority() throws CorruptDataException {
@@ -933,7 +1087,7 @@
 	class JStackFrame implements JavaStackFrame {
 
 		private JLocation location=null;
-		private Map<Integer,Object> vars=new HashMap<Integer, Object>();
+		private ObjectMapList<Integer,Object> vars=new ObjectMapList<Integer, Object>();
 		@Override
 		public ImagePointer getBasePointer() throws CorruptDataException {
 			// TODO Auto-generated method stub
@@ -955,7 +1109,7 @@
 		@Override
 		public Object getVariable(int slot) throws CorruptDataException,
 				DataUnavailable, IndexOutOfBoundsException {
-			if(vars.containsKey(slot)==false) throw new DataUnavailable("slot "+slot+" is not available");
+			if(vars.get(slot)==null) throw new DataUnavailable("slot "+slot+" is not available");
 			
 			return vars.get(slot);
 			
@@ -964,6 +1118,12 @@
 		private void addVariable(int slot,Object value) {
 			vars.put(slot, value);
 		}
+
+		@Override
+		public List getVariables() {
+			
+			return vars.values();
+		}
 	}
 	
 	class JLocation implements JavaLocation {

Added: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/SimpleImagePointer.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/SimpleImagePointer.java?rev=779548&view=auto
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/SimpleImagePointer.java (added)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/SimpleImagePointer.java Thu May 28 10:35:21 2009
@@ -0,0 +1,102 @@
+/**
+ * 
+ */
+package org.apache.kato.jvmti.reader;
+
+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;
+
+final class SimpleImagePointer implements ImagePointer {
+	private int address=0;
+	public SimpleImagePointer(int id) {
+		this.address=id;
+	}
+
+	@Override
+	public ImagePointer add(long offset) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public long getAddress() {
+		
+		return address;
+	}
+
+	@Override
+	public ImageAddressSpace getAddressSpace() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public byte getByteAt(long index) throws MemoryAccessException,
+			CorruptDataException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public double getDoubleAt(long index)
+			throws MemoryAccessException, CorruptDataException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public float getFloatAt(long index)
+			throws MemoryAccessException, CorruptDataException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public int getIntAt(long index) throws MemoryAccessException,
+			CorruptDataException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public long getLongAt(long index) throws MemoryAccessException,
+			CorruptDataException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public ImagePointer getPointerAt(long index)
+			throws MemoryAccessException, CorruptDataException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public short getShortAt(long index)
+			throws MemoryAccessException, CorruptDataException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public boolean isExecutable() throws DataUnavailable {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isReadOnly() throws DataUnavailable {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isShared() throws DataUnavailable {
+		// TODO Auto-generated method stub
+		return false;
+	}
+}
\ No newline at end of file

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath Thu May 28 10:35:21 2009
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/kato.api-0.0.1-SNAPSHOT.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry exported="true" kind="lib" path="lib/kato.api-0.0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project Thu May 28 10:35:21 2009
@@ -20,9 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.settings/org.eclipse.jdt.core.prefs?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.settings/org.eclipse.jdt.core.prefs Thu May 28 10:35:21 2009
@@ -1,5 +1,12 @@
-#Mon May 25 23:50:03 BST 2009
+#Tue May 26 16:42:19 BST 2009
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.xml
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.xml?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.xml (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.xml Thu May 28 10:35:21 2009
@@ -26,6 +26,15 @@
 		</fileset>
 	</path>
 	<property name="bootclasspath" refid="path_bootclasspath"/>
+<condition property="bundleBootClasspath" value="${JavaSE-1.6}"	>
+		<isset property="JavaSE-1.6"/>
+	</condition>
+<condition property="bundleJavacSource" value="1.6"	>
+		<isset property="JavaSE-1.6"/>
+	</condition>
+<condition property="bundleJavacTarget" value="1.6"	>
+		<isset property="JavaSE-1.6"/>
+	</condition>
 	<property name="bundleJavacSource" value="${javacSource}"/>
 	<property name="bundleJavacTarget" value="${javacTarget}"/>
 	<property name="bundleBootClasspath" value="${bootclasspath}"/>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.explorer.plugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.explorer.plugin/.classpath?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.explorer.plugin/.classpath (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.explorer.plugin/.classpath Thu May 28 10:35:21 2009
@@ -7,6 +7,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/kato.api"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/pom.xml?rev=779548&r1=779547&r2=779548&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/pom.xml (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/pom.xml Thu May 28 10:35:21 2009
@@ -23,6 +23,7 @@
 		<module>plugins/kato.api.plugin</module>
 		<module>plugins/kato.api.registry.plugin</module>
 		<module>features/kato.feature</module>
+		<module>features/kato.jdi.feature</module>
 		<!-- 
 		<module>plugins/kato.rtexplorer.plugin</module>
 		 -->