Commit f478300f authored by Christian Wulf's avatar Christian Wulf

retyped dash in front of "javaagent:..."

added log message
parent 9c2b5351
package kieker.tools.eclipse.monitoring;
import org.eclipse.core.runtime.*;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
......@@ -13,7 +14,7 @@ public class Activator extends AbstractUIPlugin {
// The shared instance
private static Activator plugin;
/**
* The constructor
*/
......@@ -22,6 +23,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
public void start(BundleContext context) throws Exception {
......@@ -31,6 +33,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
......@@ -47,4 +50,8 @@ public class Activator extends AbstractUIPlugin {
return plugin;
}
public void logInfoMsgToErrorLog(final String message) {
getLog().log(new Status(IStatus.INFO, PLUGIN_ID, message));
}
}
......@@ -3,9 +3,8 @@ package kieker.tools.eclipse.monitoring.launch;
import java.io.File;
import java.util.Arrays;
import java.util.Map;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.*;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
......@@ -15,6 +14,7 @@ import org.eclipse.jdt.launching.IVMRunner;
import org.eclipse.jdt.launching.VMRunnerConfiguration;
import org.eclipse.osgi.util.NLS;
import kieker.tools.eclipse.monitoring.Activator;
import kieker.tools.eclipse.monitoring.helper.Dependencies;
public class KiekerMonitoringLaunchConfigurationDelegate extends AbstractJavaLaunchConfigurationDelegate {
......@@ -66,7 +66,7 @@ public class KiekerMonitoringLaunchConfigurationDelegate extends AbstractJavaLau
String vmArgs = getVMArguments(configuration);
if (kiekerEnabled) {
String kiekerVersion = configuration.getAttribute(ATTR_KIEKER_VERSION, DEFAULT_KIEKER_VERSION);
String javaagentArgument = "javaagent:libs/kieker-" + kiekerVersion + "-aspectj.jar";
String javaagentArgument = "-javaagent:libs/kieker-" + kiekerVersion + "-aspectj.jar";
vmArgs = vmArgs + " " + javaagentArgument;
}
ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
......@@ -99,10 +99,11 @@ public class KiekerMonitoringLaunchConfigurationDelegate extends AbstractJavaLau
runConfig.setVMArguments(execArgs.getVMArgumentsArray());
runConfig.setWorkingDirectory(workingDirName);
runConfig.setVMSpecificAttributesMap(vmAttributesMap);
// Bootpath
runConfig.setBootClassPath(getBootpath(configuration));
String message = String.format("runner config: %s; passed VM args: %s", Arrays.toString(runConfig.getVMArguments()), vmArgs);
Activator.getDefault().logInfoMsgToErrorLog(message);
// check for cancellation
if (monitor.isCanceled()) {
return;
......
......@@ -5,4 +5,4 @@ Open the file site.xml, select the category, and click on "Build all".
Then, the files for the updatesite are created within this directory.
You do not need to synchronize or re-add the feature(s) to the category.
Moreover, you do not need to build the plugins.
The plugins should not habe a bin, build, or target folder because they are not required to build the updatesite.
This updatesite project does not require a bin, build, or target folder of the plugins.
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/kieker.tools.eclipse.feature_1.0.0.201801101455.jar" id="kieker.tools.eclipse.feature" version="1.0.0.201801101455">
<feature url="features/kieker.tools.eclipse.feature_1.0.0.201801101514.jar" id="kieker.tools.eclipse.feature" version="1.0.0.201801101514">
<category name="net.kieker-monitoring"/>
</feature>
<category-def name="net.kieker-monitoring" label="Kieker - the monitoring and dynamic analysis framework"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment