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 2010/01/12 13:19:48 UTC

svn commit: r898314 - in /incubator/kato/trunk/org.apache.kato.eclipse: ./ features/kato.feature/ features/kato.jdi.feature/ plugins/kato.api.registry.plugin/ plugins/kato.api.registry.plugin/META-INF/ plugins/kato.api.registry.plugin/src/main/java/org...

Author: spoole
Date: Tue Jan 12 13:19:47 2010
New Revision: 898314

URL: http://svn.apache.org/viewvc?rev=898314&view=rev
Log:
updated eclipse plugins to M1 version no scheme, removed API and Impl bundles - now relies on the eclipse jars built by the distro process in kato.   

Modified:
    incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/feature.xml
    incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/pom.xml
    incubator/kato/trunk/org.apache.kato.eclipse/features/kato.jdi.feature/pom.xml
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/META-INF/MANIFEST.MF
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/pom.xml
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/pom.xml
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/src/main/java/org/apache/kato/tools/explorer/plugin/views/RuntimeExplorer.java
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hexeditor.plugin/pom.xml
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hprof.reader.plugin/pom.xml
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.jdi.core.plugin/pom.xml
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/.classpath
    incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/pom.xml
    incubator/kato/trunk/org.apache.kato.eclipse/pom.xml

Modified: incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/feature.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/feature.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/feature.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/feature.xml Tue Jan 12 13:19:47 2010
@@ -21,42 +21,42 @@
          id="kato.explorer.plugin"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
    <plugin
          id="kato.query.plugin"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.kato.api.plugin"
+         id="org.apache.kato.api.registry.plugin"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.kato.api.registry.plugin"
+         id="org.apache.kato.hexeditor.plugin"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.0.1"
          unpack="false"/>
 
    <plugin
-         id="org.apache.kato.hexeditor.plugin"
+         id="kato.hprof.reader.plugin"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
    <plugin
-         id="kato.hprof.reader.plugin"
+         id="org.apache.kato.api.plugin"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.0.1"
          unpack="false"/>
 
 </feature>

Modified: incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/pom.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/features/kato.feature/pom.xml Tue Jan 12 13:19:47 2010
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>kato.eclipse</artifactId>
     <groupId>org.apache.kato</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>M1-incubating</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.kato</groupId>
   <artifactId>kato.eclipse.feature</artifactId>
   <packaging>zip</packaging>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>M1-incubating</version>
   <build>
   	<plugins>
       <plugin>

Modified: incubator/kato/trunk/org.apache.kato.eclipse/features/kato.jdi.feature/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/features/kato.jdi.feature/pom.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/features/kato.jdi.feature/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/features/kato.jdi.feature/pom.xml Tue Jan 12 13:19:47 2010
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>kato.eclipse</artifactId>
     <groupId>org.apache.kato</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>M1-incubating</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.kato</groupId>
   <artifactId>kato.jdi.eclipse.feature</artifactId>
   <packaging>zip</packaging>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>M1-incubating</version>
   <build>
   	<plugins>
       <plugin>

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/META-INF/MANIFEST.MF?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/META-INF/MANIFEST.MF (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/META-INF/MANIFEST.MF Tue Jan 12 13:19:47 2010
@@ -17,7 +17,8 @@
  org.eclipse.core.runtime.compatibility,
  org.eclipse.ui.ide,
  org.eclipse.ui.editors,
- org.apache.kato.api.plugin
+ org.apache.kato.support.plugin;bundle-version="0.0.1",
+ org.apache.kato.api.plugin;bundle-version="0.0.1"
 Export-Package: org.apache.kato.api.plugin;
   uses:="org.eclipse.jface.resource,
    org.apache.kato.image,
@@ -28,6 +29,7 @@
    org.eclipse.ui,
    org.eclipse.swt.widgets,
    org.eclipse.core.runtime.preferences",
+ org.apache.kato.hprof.image,
  org.apache.kato.jvmti.javaruntime,
  org.apache.kato.jvmti.process,
  org.apache.kato.jvmti.reader

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/pom.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/pom.xml Tue Jan 12 13:19:47 2010
@@ -2,47 +2,13 @@
   <parent>
     <artifactId>kato.eclipse</artifactId>
     <groupId>org.apache.kato</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>M1-incubating</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.kato</groupId>
   <artifactId>kato.api.registry.eclipse.plugin</artifactId>
   <packaging>pom</packaging>
-  <version>0.0.1-SNAPSHOT</version>
-  <dependencies>
-  	<dependency>
-  		<groupId>org.apache.kato</groupId>
-  		<artifactId>kato.jvmti</artifactId>
-  		<version>0.0.1-SNAPSHOT</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.apache.kato</groupId>
-  		<artifactId>kato.hprof.api</artifactId>
-  		<version>0.0.1-SNAPSHOT</version>
-  	</dependency>
-  </dependencies>
+  <version>M1-incubating</version>
+  
   
-  <build>
-  	<plugins>
-  	<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>lib</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-  	</plugins> 
-  </build>
 </project>
\ No newline at end of file

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.api.registry.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java Tue Jan 12 13:19:47 2010
@@ -2,10 +2,13 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Iterator;
 
+import javax.imageio.spi.ServiceRegistry;
 import javax.tools.diagnostics.FactoryRegistry;
 import javax.tools.diagnostics.image.Image;
 import javax.tools.diagnostics.image.ImageFactory;
+import javax.tools.diagnostics.runtime.java.JavaRuntime;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
@@ -44,16 +47,14 @@
 		super.start(context);
 		plugin = this;
 		registry=FactoryRegistry.getDefaultRegistry();
-		addEclipseRegisteredFactories(registry);
-		
 		
+		registry.addFactory(new org.apache.kato.hprof.image.ImageFactoryImpl());
+		registry.addFactory(new org.apache.kato.jdump.image.ImageFactoryImpl());
 		registry.addFactory(new org.apache.kato.jvmti.process.ImageFactoryImpl());
 		
-		registry.addFactory(new org.apache.kato.hprof.image.ImageFactoryImpl());
-		/**
-		registry.addFactory(new com.ibm.katoblue.image.j9.ImageFactoryImpl());
-		registry.addFactory(new com.ibm.katoblue.image.javacore.JCImageFactory());
-		**/
+		addEclipseRegisteredFactories(registry);
+		
+		
 	}
 
 	private void addEclipseRegisteredFactories(FactoryRegistry registry2) throws CoreException {
@@ -84,8 +85,8 @@
 		super.stop(context);
 	}
 
-	public Image getImage(File file) throws IOException {
-		return registry.getImage(file);
+	public JavaRuntime getjavaRuntime(File file) throws IOException {
+		return registry.getJavaRuntime(file);
 	}
 	public ImageFactory[] getRegisteredFactories() {
 		return registry.getFactories();

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/pom.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/pom.xml Tue Jan 12 13:19:47 2010
@@ -2,11 +2,11 @@
   <parent>
     <artifactId>kato.eclipse</artifactId>
     <groupId>org.apache.kato</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>M1-incubating</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.kato</groupId>
   <artifactId>kato.explorer.eclipse.plugin</artifactId>
   <packaging>pom</packaging>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>M1-incubating</version>
  </project>
\ No newline at end of file

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/src/main/java/org/apache/kato/tools/explorer/plugin/views/RuntimeExplorer.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/src/main/java/org/apache/kato/tools/explorer/plugin/views/RuntimeExplorer.java?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/src/main/java/org/apache/kato/tools/explorer/plugin/views/RuntimeExplorer.java (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.explorer.plugin/src/main/java/org/apache/kato/tools/explorer/plugin/views/RuntimeExplorer.java Tue Jan 12 13:19:47 2010
@@ -278,14 +278,14 @@
 						ps.busyCursorWhile(new IRunnableWithProgress() {
 						      public void run(IProgressMonitor pm) {
 						    	  pm.beginTask("reading file", IProgressMonitor.UNKNOWN);
-						    	  javax.tools.diagnostics.image.Image image=null;
+						    	  javax.tools.diagnostics.runtime.java.JavaRuntime runtime=null;
 								try {
-									image = org.apache.kato.api.plugin.Activator.getDefault().getImage(dump);
+									runtime = org.apache.kato.api.plugin.Activator.getDefault().getjavaRuntime(dump);
 								} catch (IOException e) {
 									showMessage("Error reading Image File " + dump.getAbsolutePath());
 									return;
 								}
-						    	  TreeParent root = createNodeFromItem(dump.getName(), javax.tools.diagnostics.image.Image.class, image);
+						    	  TreeParent root = createNodeFromItem(dump.getName(), javax.tools.diagnostics.runtime.java.JavaRuntime.class, runtime);
 									invisibleRoot = new TreeParent("");
 									invisibleRoot.addChild(root);
 								
@@ -327,7 +327,7 @@
 		private Class getKatoInterface(Class clazz) {
 			Class[] ifaces = clazz.getInterfaces();
 			for(int i = 0; i < ifaces.length; i++) {
-				if(ifaces[i].getName().startsWith("org.apache.kato")) {
+				if(ifaces[i].getName().startsWith("javax.tools.diagnostics")) {
 					return ifaces[i];
 				}
 			}

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hexeditor.plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hexeditor.plugin/pom.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hexeditor.plugin/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hexeditor.plugin/pom.xml Tue Jan 12 13:19:47 2010
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>kato.eclipse</artifactId>
     <groupId>org.apache.kato</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>M1-incubating</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.kato</groupId>
   <artifactId>kato.hexeditor.eclipse.plugin</artifactId>
   <packaging>pom</packaging>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>M1-incubating</version>
   <build>
   	<plugins>
     	<plugin>

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hprof.reader.plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hprof.reader.plugin/pom.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hprof.reader.plugin/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.hprof.reader.plugin/pom.xml Tue Jan 12 13:19:47 2010
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>kato.eclipse</artifactId>
     <groupId>org.apache.kato</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>M1-incubating</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.kato</groupId>
   <artifactId>kato.hprof.reader.eclipse.plugin</artifactId>
   <packaging>pom</packaging>
   <name>Apache Kato HPROF Reader Eclipse Plugin</name>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>M1-incubating</version>
   <dependencies>
   	<dependency>
   		<groupId>org.apache.kato</groupId>
   		<artifactId>kato.hprof.reader</artifactId>
-  		<version>0.0.1-SNAPSHOT</version>
+  		<version>M1-incubating</version>
   	</dependency>
   </dependencies>
    <build>

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.jdi.core.plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.jdi.core.plugin/pom.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.jdi.core.plugin/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.jdi.core.plugin/pom.xml Tue Jan 12 13:19:47 2010
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>kato.eclipse</artifactId>
     <groupId>org.apache.kato</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>M1-incubating</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.kato</groupId>
   <artifactId>kato.jdi.core.eclipse.plugin</artifactId>
   <packaging>pom</packaging>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>M1-incubating</version>
   
    <build>
   	<plugins>
@@ -37,7 +37,7 @@
    	<dependency>
    		<groupId>org.apache.kato</groupId>
    		<artifactId>kato.jdi</artifactId>
-   		<version>0.0.1-SNAPSHOT</version>
+   		<version>M1-incubating</version>
    	</dependency>
    </dependencies>
  </project>
\ No newline at end of file

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/.classpath?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/.classpath (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/.classpath Tue Jan 12 13:19:47 2010
@@ -7,5 +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 kind="output" path="bin"/>
 </classpath>

Modified: incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/pom.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/plugins/kato.query.plugin/pom.xml Tue Jan 12 13:19:47 2010
@@ -2,11 +2,11 @@
   <parent>
     <artifactId>kato.eclipse</artifactId>
     <groupId>org.apache.kato</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>M1-incubating</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.kato</groupId>
   <artifactId>kato.query.eclipse.plugin</artifactId>
   <packaging>pom</packaging>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>M1-incubating</version>
 </project>
\ No newline at end of file

Modified: incubator/kato/trunk/org.apache.kato.eclipse/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.eclipse/pom.xml?rev=898314&r1=898313&r2=898314&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.eclipse/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato.eclipse/pom.xml Tue Jan 12 13:19:47 2010
@@ -4,13 +4,12 @@
   <artifactId>kato.eclipse</artifactId>
   <packaging>pom</packaging>
   <name>Apache Kato Eclipse plugins</name>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>M1-incubating</version>
   <description>Apache Kato Eclipse plugins</description>
   	<modules>
   		<module>plugins/kato.hexeditor.plugin</module>
 		<module>plugins/kato.explorer.plugin</module>
 		<module>plugins/kato.query.plugin</module>
-		<module>plugins/kato.api.plugin</module>
 		<module>plugins/kato.api.registry.plugin</module>
 		<module>plugins/kato.jdi.core.plugin</module>
 		<module>plugins/kato.hprof.reader.plugin</module>