geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r527589 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java
Date Wed, 11 Apr 2007 17:52:01 GMT
Author: sppatel
Date: Wed Apr 11 10:52:00 2007
New Revision: 527589

URL: http://svn.apache.org/viewvc?view=rev&rev=527589
Log:
add new profiling support (disabled until next WTP integration driver)

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java?view=diff&rev=527589&r1=527588&r2=527589
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java
Wed Apr 11 10:52:00 2007
@@ -33,6 +33,7 @@
 import org.eclipse.jdt.launching.IVMInstall;
 import org.eclipse.jdt.launching.IVMRunner;
 import org.eclipse.jdt.launching.VMRunnerConfiguration;
+import org.eclipse.jst.server.core.ServerProfilerDelegate;
 import org.eclipse.jst.server.core.internal.JavaServerPlugin;
 import org.eclipse.jst.server.core.internal.ServerProfiler;
 import org.eclipse.wst.server.core.IServer;
@@ -67,9 +68,10 @@
 		String mainTypeName = geronimoServer.getRuntimeClass();
 		IVMInstall vm = verifyVMInstall(configuration);
 		IVMRunner runner = vm.getVMRunner(mode);
-
-		if (runner == null)
+		
+		if(runner == null && ILaunchManager.PROFILE_MODE.equals(mode)){
 			runner = vm.getVMRunner(ILaunchManager.RUN_MODE);
+		}
 
 		File workingDir = verifyWorkingDirectory(configuration);
 		String workingDirName = null;
@@ -82,7 +84,7 @@
 		
 		if (ILaunchManager.PROFILE_MODE.equals(mode)) {
 			ServerProfiler[] sp = JavaServerPlugin.getServerProfilers();
-			if (sp == null || sp.length ==0 || runner == null) {
+			if (sp == null || sp.length == 0 || runner == null) {
 				geronimoServer.stopImpl();
 				throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, Messages.errorNoProfiler,
null));
 			}
@@ -107,6 +109,15 @@
 			runConfig.setBootClassPath(bootpath);
 
 		setDefaultSourceLocator(launch, configuration);
+		
+		/*if (ILaunchManager.PROFILE_MODE.equals(mode)) {
+			try {
+				ServerProfilerDelegate.configureProfiling(launch, vm, runConfig, monitor);
+			} catch (CoreException ce) {
+				geronimoServer.stopImpl();
+				throw ce;
+			}
+		}*/
 
 		geronimoServer.startPingThread();
 		runner.run(runConfig, launch, monitor);



Mime
View raw message