diff --git a/profiler.j2ee/nbproject/project.xml b/profiler.j2ee/nbproject/project.xml
--- a/profiler.j2ee/nbproject/project.xml
+++ b/profiler.j2ee/nbproject/project.xml
@@ -260,6 +260,15 @@
+ org.netbeans.modules.server
+
+
+
+ 0-1
+ 1.18
+
+
+
org.openide.awt
diff --git a/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/impl/ProfilerVMArgsProvider.java b/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/impl/ProfilerVMArgsProvider.java
new file mode 100644
--- /dev/null
+++ b/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/impl/ProfilerVMArgsProvider.java
@@ -0,0 +1,74 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2011 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.profiler.j2ee.impl;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.netbeans.api.server.VMArguments.StartMode;
+import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerServerSettings;
+import org.netbeans.modules.j2ee.deployment.profiler.spi.Profiler;
+import org.netbeans.spi.server.VMArgumentsProvider;
+import org.openide.util.Lookup;
+
+/**
+ *
+ * @author Jaroslav Bachorik
+ */
+@VMArgumentsProvider.Registration
+public class ProfilerVMArgsProvider implements VMArgumentsProvider {
+ @Override
+ public List getArguments(String instanceId, StartMode mode) {
+ if (mode == StartMode.PROFILE) {
+ Profiler p = Lookup.getDefault().lookup(Profiler.class);
+ ProfilerServerSettings ps = p.getSettings(instanceId);
+ return Arrays.asList(ps.getJvmArgs());
+ }
+ return Collections.EMPTY_LIST;
+ }
+
+ @Override
+ public String getDescription() {
+ return "NetBeans Profiler";
+ }
+
+}