Attachment #116818 for bug #203519

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 203519
Collapse All | Expand All




     */
    private static final Set<String> COMMON_IDE_GLOBAL_ACTIONS = new HashSet<String>(Arrays.asList(
        ActionProvider.COMMAND_DEBUG,
        ActionProvider.COMMAND_PROFILE,
        ActionProvider.COMMAND_DELETE,
        ActionProvider.COMMAND_COPY,
        ActionProvider.COMMAND_MOVE,

                    // Check whether the context contains files all in this folder,
                    // matching the pattern if any, and matching the arity (single/multiple).
                    Map<String,FileObject> selection = findSelection(contextEl, context, project,
                            command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) || 
                            command.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD) ? new AtomicReference<String>() : null);
                    LOG.log(Level.FINE, "detected selection {0} for command {1} in {2}", new Object[] {selection, command, project});
                    if (selection.size() == 1) {
                        // Definitely enabled.

                }
                Element contextEl = XMLUtil.findElement(actionEl, "context", FreeformProjectType.NS_GENERAL); // NOI18N
                if (contextEl != null) {
                    AtomicReference<String> methodName = SingleMethod.COMMAND_RUN_SINGLE_METHOD.equals(command) || 
                                                         SingleMethod.COMMAND_DEBUG_SINGLE_METHOD.equals(command) ?
                        new AtomicReference<String>() : null;
                    Map<String,FileObject> selection = findSelection(contextEl, context, project, methodName);
                    if (selection.isEmpty()) {

Lines 62-67 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/Bundle.properties (+1 lines)
62	CMD_run=Run	62	CMD_run=Run
63	CMD_test=Test	63	CMD_test=Test
64	CMD_debug=Debug	64	CMD_debug=Debug
		65	CMD_profile=Profile
65	CMD_javadoc=Generate Javadoc	66	CMD_javadoc=Generate Javadoc
66	CMD_redeploy=Redeploy	67	CMD_redeploy=Redeploy
67	CMD_deploy=Deploy	68	CMD_deploy=Deploy

Lines 74-83 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/resources/layer.xml (-4 lines)
74	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>	74	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
75	<attr name="position" intvalue="400"/>	75	<attr name="position" intvalue="400"/>
76	</file>	76	</file>
77	<file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.shadow">
78	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.instance"/>
79	<attr name="position" intvalue="500"/>
80	</file>
81	<file name="sep-3.instance">	77	<file name="sep-3.instance">
82	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>	78	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
83	<attr name="position" intvalue="600"/>	79	<attr name="position" intvalue="600"/>

Lines 160-169 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml (-4 lines)
160	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>	160	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>
161	<attr name="position" intvalue="900"/>	161	<attr name="position" intvalue="900"/>
162	</file>	162	</file>
163	<file name="profiler.shadow">
164	<attr name="originalFile" stringvalue="Projects/Profiler_Actions_temporary"/>
165	<attr name="position" intvalue="1000"/>
166	</file>
167	<file name="org-netbeans-modules-project-ui-TestProject.shadow">	163	<file name="org-netbeans-modules-project-ui-TestProject.shadow">
168	<attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestProject.instance"/>	164	<attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestProject.instance"/>
169	<attr name="position" intvalue="1100"/>	165	<attr name="position" intvalue="1100"/>





import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.regex.Pattern;
import javax.lang.model.element.TypeElement;
import javax.swing.Action;


    static final Set<String> bkgActions = new HashSet<String>(Arrays.asList(
        COMMAND_RUN_SINGLE,
        COMMAND_DEBUG_SINGLE,
        COMMAND_PROFILE_SINGLE
    ));

    private static final String COMMAND_NBM = "nbm";

        }
        globalCommands.put(ActionProvider.COMMAND_RUN, new String[] {"run"}); // NOI18N
        globalCommands.put(ActionProvider.COMMAND_DEBUG, new String[] {"debug"}); // NOI18N
        globalCommands.put(ActionProvider.COMMAND_PROFILE, new String[] {"profile"}); // NOI18N
        globalCommands.put(JavaProjectConstants.COMMAND_JAVADOC, new String[] {"javadoc-nb"}); // NOI18N
        globalCommands.put(ActionProvider.COMMAND_TEST, new String[] {"test-unit"}); // NOI18N
        globalCommands.put(COMMAND_NBM, new String[] {COMMAND_NBM});

        if (!project.supportedTestTypes().isEmpty()) {
            supportedActionsSet.add(ActionProvider.COMMAND_TEST_SINGLE);
            supportedActionsSet.add(ActionProvider.COMMAND_DEBUG_TEST_SINGLE);
            supportedActionsSet.add(ActionProvider.COMMAND_PROFILE_TEST_SINGLE);
            supportedActionsSet.add(ActionProvider.COMMAND_RUN_SINGLE);
            supportedActionsSet.add(ActionProvider.COMMAND_DEBUG_SINGLE);
            supportedActionsSet.add(ActionProvider.COMMAND_PROFILE_SINGLE);
            supportedActionsSet.add(SingleMethod.COMMAND_RUN_SINGLE_METHOD);
            supportedActionsSet.add(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD);
        }

            if (testSources == null)
                    testSources = findTestSources(context, false);
            return testSources != null && testSources.isSingle();
        } else if (command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
            TestSources testSources = findTestSourcesForSources(context);
            if (testSources == null)
                    testSources = findTestSources(context, false);
            return testSources != null && testSources.isSingle();
        } else if (command.equals(COMMAND_RUN_SINGLE)) {
            return findTestSources(context, false) != null;
        } else if (command.equals(COMMAND_DEBUG_SINGLE)) {
            TestSources testSources = findTestSources(context, false);
            return testSources != null && testSources.isSingle();
        } else if (command.equals(COMMAND_PROFILE_SINGLE)) {
            TestSources testSources = findTestSources(context, false);
            return testSources != null && testSources.isSingle();
        } else if (command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) || 
                   command.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD)
                ) {
            NbPlatform plaf = project.getPlatform(false);
            if (plaf == null || plaf.getHarnessVersion().compareTo(HarnessVersion.V70) < 0) {
                return false;


                    }
                    targetNames = setupDebugTestSingle(p, testSources);
                } else if (command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
                    TestSources testSources = findTestSourcesForSources(context);
                    if (testSources == null) {
                        testSources = findTestSources(context, false);

                    }
                    targetNames = setupProfileTestSingle(p, testSources);
                } else if (command.equals(COMMAND_RUN_SINGLE)) {
                    TestSources testSources = findTestSources(context, false);
//       TODO CoS     String enableQuickTest = project.evaluator().getProperty("quick.test.single"); // NOI18N

                        // fallback to "old" debug tests behavior
                        targetNames = setupDebugTestSingle(p, testSources);
                    }
                } else if (command.equals(COMMAND_PROFILE_SINGLE)) {
                    TestSources testSources = findTestSources(context, false);
                    String clazz = getMainClass(context);
                    if (clazz != null) {
                        targetNames = setupProfileMain(p, testSources, context, clazz);
                    } else {
                        // fallback to "old" debug tests behavior
                        targetNames = setupProfileTestSingle(p, testSources);
                    }
                } else if (command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD)) {
                    TestSources testSources = findTestMethodSources(context);
                    p.setProperty("test.class", testClassName(testSources)); // NOI18N

                    return;
                } else {
                    // XXX consider passing PM.fP(FU.toFO(SuiteUtils.suiteDirectory(project))) instead for a suite component project:
                    setRunArgsIde(project, SingleModuleProperties.getInstance(project), command, p, project.getTestUserDirLockFile());
                    if (command.equals(ActionProvider.COMMAND_REBUILD)) {
                        p.setProperty("do.not.clean.module.config.xml", "true"); // #196192
                    }

                    }
                }
                try {
                    setRunArgsIde(project, SingleModuleProperties.getInstance(project), command, p, project.getTestUserDirLockFile());
                    ActionUtils.runTarget(findBuildXml(project), targetNames, p);
                } catch (IOException e) {
                    Util.err.notify(e);

        } else
            runnable.run();
    }
    
    private String[] setupProfileTestSingle(Properties p, TestSources testSources) {
        p.setProperty("test.includes", testSources.includes().replace("**", "**/*Test.java")); // NOI18N
        p.setProperty("test.type", testSources.testType); // NOI18N
        return new String[] {"profile-test-single-nb"}; // NOI18N
    }

    static void setRunArgsIde(Project project, ModuleProperties modprops, String command, Properties p, File testUserDirLockFile) {
        StringBuilder runArgsIde = new StringBuilder();

            mode = StartupExtender.StartMode.NORMAL;
        } else if (command.equals(COMMAND_DEBUG) || command.equals(COMMAND_DEBUG_SINGLE) || command.equals(COMMAND_DEBUG_STEP_INTO)) {
            mode = StartupExtender.StartMode.DEBUG;
        } else if (command.equals(COMMAND_PROFILE) || command.equals(COMMAND_PROFILE_SINGLE) || command.equals("profile-osgi")) {
            mode = StartupExtender.StartMode.PROFILE;
        } else if (command.equals(COMMAND_TEST) || command.equals(COMMAND_TEST_SINGLE)) {
            mode = StartupExtender.StartMode.TEST_NORMAL;
        } else if (command.equals(COMMAND_DEBUG_TEST_SINGLE)) {
            mode = StartupExtender.StartMode.TEST_DEBUG;
        } else if (command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
            mode = StartupExtender.StartMode.TEST_PROFILE;
        } else {
            mode = null;
        }
        
        boolean isTest = (EnumSet.of(
                            StartupExtender.StartMode.TEST_PROFILE, 
                            StartupExtender.StartMode.TEST_NORMAL, 
                            StartupExtender.StartMode.TEST_DEBUG).contains(mode) || 
                          command.equals(COMMAND_PROFILE_SINGLE));
        if (mode != null) {
            JavaPlatform plaf = modprops.getJavaPlatform();
            Lookup context = Lookups.fixed(project, plaf != null ? plaf : JavaPlatformManager.getDefault().getDefaultPlatform());
            for (StartupExtender group : StartupExtender.getExtenders(context, mode)) {
                for (String arg : group.getArguments()) {
                    runArgsIde.append(isTest ? "" : "-J").append(arg).append(' ');
                }
            }
        }
        if ((command.equals(ActionProvider.COMMAND_RUN) || 
             command.equals(ActionProvider.COMMAND_DEBUG) ||
             command.equals(ActionProvider.COMMAND_PROFILE)) // #63652
                && testUserDirLockFile.isFile()) {
            // #141069: lock file exists, run with bogus option
            runArgsIde.append(TEST_USERDIR_LOCK_PROP_VALUE);

        return  new String[] {"debug-test-main-nb"};    // NOI18N
    }
    
    private String[] setupProfileMain(Properties p, TestSources testSources, Lookup context, String mainClass) {
        p.setProperty("main.class", mainClass);    // NOI18N
        p.setProperty("test.type", testSources.testType); // NOI18N
        return  new String[] {"profile-test-main-nb"};    // NOI18N
    }
    
    private String testClassName(TestSources testSources) {
        String path = testSources.includes();
        assert path.endsWith(".java") && !path.contains(",") : path;

    private boolean bypassAntBuildScript(String command, FileObject[] files) throws IllegalArgumentException {
        FileObject toRun = null;

        if (COMMAND_RUN_SINGLE.equals(command) || 
            COMMAND_DEBUG_SINGLE.equals(command) ||
            COMMAND_PROFILE_SINGLE.equals(command)) {
            toRun = files[0];
        }
        
        if (toRun != null) {
            String commandToExecute = COMMAND_RUN_SINGLE.equals(command) ? 
                                        JavaRunner.QUICK_TEST : 
                                        (COMMAND_DEBUG_SINGLE.equals(command) ? 
                                            JavaRunner.QUICK_TEST_DEBUG :
                                            JavaRunner.QUICK_TEST_PROFILE);
            if (!JavaRunner.isSupported(commandToExecute, Collections.singletonMap(JavaRunner.PROP_EXECUTE_FILE, toRun))) {
                return false;
            }




    private static final String COMMAND_DEBUG_JNLP = "debug-jnlp";
    private static final String COMMAND_DEBUG_OSGI = "debug-osgi";
    private static final String COMMAND_NBMS = "nbms";
    private static final String COMMAND_PROFILE = "profile";
    private static final String COMMAND_PROFILE_OSGI = "profile-osgi";
    private static final String COMMAND_RUN_JNLP = "run-jnlp";
    private static final String COMMAND_RUN_OSGI = "run-osgi";

        return ProjectSensitiveActions.projectCommandAction(COMMAND_DEBUG_OSGI, SUITE_ACTION_debug_osgi(), null);
    }

//    @ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.profileOsgi")
//    @ActionRegistration(displayName="#SUITE_ACTION_profile_osgi", lazy=false)
//    @ActionReference(path=SUITE_OSGI_ACTIONS_PATH, position=500)
//    @Messages("SUITE_ACTION_profile_osgi=Profile in Felix")
//    public static Action profileOsgi() {
//        return ProjectSensitiveActions.projectCommandAction(COMMAND_PROFILE_OSGI, SUITE_ACTION_profile_osgi(), null);
//    }

    @ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.branding")
    @ActionRegistration(displayName="#SUITE_ACTION_branding", lazy=false)




            <reference refid="cluster.path.id"/>
        </antcall>
    </target>
    
    <target name="-profile-check" if="netbeans.home">
        <condition property="profiler.configured">
            <or>
                <contains string="${run.jvmargs.ide}" substring="-agentpath:" casesensitive="false"/>
                <contains string="${run.jvmargs.ide}" substring="-javaagent:" casesensitive="false"/>
            </or>
        </condition>
    </target>
    
    <target name="profile" depends="-profile-check,build-jnlp-local" description="Executes this suite as JNLP application under profiler" if="profiler.configured" unless="profiler.info.jvmargs.agent">
        <startprofiler/>
        <antcall target="run"/>
    </target>

    <target name="-check-for-jnlp-userdir">
        <property name="jnlp.userdir" location="${user.home}/.nbapp-${app.name}"/>




            <reference refid="cluster.path.id"/>
        </antcall>
    </target>
    
    <target name="-profile-check">
        <condition property="profiler.configured" if="netbeans.home">
            <or>
                <contains string="${osgi.run.args}" substring="-agentpath:" casesensitive="false"/>
                <contains string="${osgi.run.args}" substring="-javaagent:" casesensitive="false"/>
                <contains string="${osgi.run.args.extra}" substring="-agentpath:" casesensitive="false"/>
                <contains string="${osgi.run.args.extra}" substring="-javaagent:" casesensitive="false"/>
            </or>
        </condition>
    </target>
    
    <target name="profile" depends="-profile-check,-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent" description="Profile a project in the IDE." unless="profiler.info.jvmargs.agent">        
        <startprofiler/>
        <antcall target="run">
            <reference refid="cluster.path.id"/>
        </antcall>
    </target>
    
    <target name="-profile-pre72" if="profiler.info.jvmargs.agent">
        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
        <nbprofiledirect jvmargsprefix="" jvmargsproperty="profiler.jvmargs">
            <classpath>

            <reference refid="cluster.path.id"/>
        </antcall>
    </target>

</project>




        </antcall>
    </target>
    
    <target name="-profile-check" if="netbeans.home">
        <condition property="profiler.configured">
            <or>
                <contains string="${run.args.ide}" substring="-agentpath:" casesensitive="false"/>
                <contains string="${run.args.ide}" substring="-javaagent:" casesensitive="false"/>
            </or>
        </condition>
    </target>
    
    <target name="profile" depends="-profile-check,-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent" description="Profile a project in the IDE." unless="profiler.info.jvmargs.agent">        
        <startprofiler/>
        <antcall target="run">
            <reference refid="cluster.path.id"/>
        </antcall>
    </target>
    
    <target name="-profile-pre72" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent">
        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
        <nbprofiledirect 
            jvmargsprefix="-J" 

            <reference refid="cluster.path.id"/>
        </antcall>
    </target>
    
</project>

Lines 65-70 Link Here

(-)a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Deploy.java (-1 / +22 lines)
65	*/	65	*/
66	private boolean debugmode = false;	66	private boolean debugmode = false;
67		67
		68	/**
		69	* Holds value of property profilemode.
		70	*/
		71	private boolean profilemode = false;
		72
68	private boolean forceRedeploy = false;	73	private boolean forceRedeploy = false;
69		74
70	/**	75	/**
Lines 104-110 Link Here
104		109
105	try {	110	try {
106	String clientUrl = Deployment.getDefault ().deploy (jmp,	111	String clientUrl = Deployment.getDefault ().deploy (jmp,
107	debugmode ? Deployment.Mode.DEBUG : Deployment.Mode.RUN,	112	debugmode ? Deployment.Mode.DEBUG : (profilemode ? Deployment.Mode.PROFILE : Deployment.Mode.RUN),
108	clientModuleUri, clientUrlPart, forceRedeploy, this);	113	clientModuleUri, clientUrlPart, forceRedeploy, this);
109	if (clientUrl != null) {	114	if (clientUrl != null) {
110	getProject().setProperty("client.url", clientUrl);	115	getProject().setProperty("client.url", clientUrl);
Lines 149-160 Link Here
149	}	154	}
150		155
151	/**	156	/**
		157	* Getter for property profilemode.
		158	* @return Value of property profilemode.
		159	*/
		160	public boolean getProfilemode() {
		161	return this.profilemode;
		162	}
		163
		164	/**
152	* Setter for property debugmode.	165	* Setter for property debugmode.
153	* @param debugmode New value of property debugmode.	166	* @param debugmode New value of property debugmode.
154	*/	167	*/
155	public void setDebugmode(boolean debugmode) {	168	public void setDebugmode(boolean debugmode) {
156	this.debugmode = debugmode;	169	this.debugmode = debugmode;
157	}	170	}
		171
		172	/**
		173	* Setter for property profilemode.
		174	* @param debugmode New value of property profilemode.
		175	*/
		176	public void setProfilemode(boolean profilemode) {
		177	this.profilemode = profilemode;
		178	}
158		179
159	public boolean getForceRedeploy() {	180	public boolean getForceRedeploy() {
160	return this.forceRedeploy;	181	return this.forceRedeploy;

Lines 109-119 Link Here

(-)a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartProfiledServer.java (-5 / +5 lines)
109	String msg = NbBundle.getMessage(StartProfiledServer.class, "MSG_StartupFailed");	109	String msg = NbBundle.getMessage(StartProfiledServer.class, "MSG_StartupFailed");
110	throw new BuildException(msg);	110	throw new BuildException(msg);
111	}	111	}
112	log(NbBundle.getMessage(StartProfiledServer.class, "MSG_AttachingProfiler"));	112	// log(NbBundle.getMessage(StartProfiledServer.class, "MSG_AttachingProfiler"));
113	if (!profiler.attachProfiler(getProject().getProperties())) {	113	// if (!profiler.attachProfiler(getProject().getProperties())) {
114	String msg = NbBundle.getMessage(StartProfiledServer.class, "MSG_AttachFailed");	114	// String msg = NbBundle.getMessage(StartProfiledServer.class, "MSG_AttachFailed");
115	throw new BuildException(msg);	115	// throw new BuildException(msg);
116	}	116	// }
117	log(NbBundle.getMessage(StartProfiledServer.class, "MSG_ProfilerAttached"));	117	log(NbBundle.getMessage(StartProfiledServer.class, "MSG_ProfilerAttached"));
118	// wait for the server to finish its startup	118	// wait for the server to finish its startup
119	long timeout = System.currentTimeMillis() + startupTimeout;	119	long timeout = System.currentTimeMillis() + startupTimeout;

Lines 69-74 Link Here

(-)a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartServer.java (+23 lines)
69	*/	69	*/
70	private boolean debugmode = false;	70	private boolean debugmode = false;
71		71
		72	/**
		73	* Holds value of property profilemode.
		74	*/
		75	private boolean profilemode = false;
		76
72	public void execute() throws BuildException {	77	public void execute() throws BuildException {
73		78
74	ClassLoader originalLoader = null;	79	ClassLoader originalLoader = null;
Lines 107-112 Link Here
107	try {	112	try {
108	if (debugmode) {	113	if (debugmode) {
109	si.startDebug(ui);	114	si.startDebug(ui);
		115	} else if (profilemode) {
		116	si.startProfile(false, ui);
110	} else {	117	} else {
111	si.start(ui);	118	si.start(ui);
112	}	119	}
Lines 156-161 Link Here
156	public boolean getDebugmode() {	163	public boolean getDebugmode() {
157	return this.debugmode;	164	return this.debugmode;
158	}	165	}
		166
		167	/**
		168	* Getter for property profilemode.
		169	* @return Value of property profilemode.
		170	*/
		171	public boolean getProfilemode() {
		172	return this.profilemode;
		173	}
159		174
160	/**	175	/**
161	* Setter for property debugmode.	176	* Setter for property debugmode.
Lines 164-167 Link Here
164	public void setDebugmode(boolean debugmode) {	179	public void setDebugmode(boolean debugmode) {
165	this.debugmode = debugmode;	180	this.debugmode = debugmode;
166	}	181	}
		182
		183	/**
		184	* Setter for property profilemode.
		185	* @param profilemode New value of property profilemode.
		186	*/
		187	public void setProfilemode(boolean profilemode) {
		188	this.profilemode = profilemode;
		189	}
167	}	190	}

Lines 112-117 Link Here

(-)a/j2ee.earproject/nbproject/project.xml (+9 lines)
112	<run-dependency/>	112	<run-dependency/>
113	</dependency>	113	</dependency>
114	<dependency>	114	<dependency>
		115	<code-name-base>org.netbeans.modules.extexecution</code-name-base>
		116	<build-prerequisite/>
		117	<compile-dependency/>
		118	<run-dependency>
		119	<release-version>2</release-version>
		120	<specification-version>1.30</specification-version>
		121	</run-dependency>
		122	</dependency>
		123	<dependency>
115	<code-name-base>org.netbeans.modules.j2ee.api.ejbmodule</code-name-base>	124	<code-name-base>org.netbeans.modules.j2ee.api.ejbmodule</code-name-base>
116	<build-prerequisite/>	125	<build-prerequisite/>
117	<compile-dependency/>	126	<compile-dependency/>

Lines 45-52 Link Here

(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java (-1 / +89 lines)
45	package org.netbeans.modules.j2ee.earproject;	45	package org.netbeans.modules.j2ee.earproject;
46		46
47	import java.io.IOException;	47	import java.io.IOException;
		48	import java.util.ArrayList;
		49	import java.util.Collections;
48	import java.util.HashMap;	50	import java.util.HashMap;
49	import java.util.Iterator;	51	import java.util.Iterator;
		52	import java.util.List;
50	import java.util.Map;	53	import java.util.Map;
51	import java.util.Properties;	54	import java.util.Properties;
52	import java.util.Set;	55	import java.util.Set;
Lines 54-60 Link Here
54	import org.netbeans.api.debugger.DebuggerManager;	57	import org.netbeans.api.debugger.DebuggerManager;
55	import org.netbeans.api.debugger.Session;	58	import org.netbeans.api.debugger.Session;
56	import org.netbeans.api.debugger.jpda.AttachingDICookie;	59	import org.netbeans.api.debugger.jpda.AttachingDICookie;
57	import org.netbeans.api.j2ee.core.Profile;	60	import org.netbeans.api.extexecution.startup.StartupExtender;
		61	import org.netbeans.api.java.platform.JavaPlatform;
		62	import org.netbeans.api.java.platform.JavaPlatformManager;
58	import org.netbeans.api.project.Project;	63	import org.netbeans.api.project.Project;
59	import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants;	64	import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants;
60	import org.netbeans.modules.j2ee.common.project.ui.DeployOnSaveUtils;	65	import org.netbeans.modules.j2ee.common.project.ui.DeployOnSaveUtils;
Lines 68-73 Link Here
68	import org.netbeans.modules.j2ee.earproject.ui.customizer.CustomizerProviderImpl;	73	import org.netbeans.modules.j2ee.earproject.ui.customizer.CustomizerProviderImpl;
69	import org.netbeans.modules.j2ee.earproject.ui.customizer.EarProjectProperties;	74	import org.netbeans.modules.j2ee.earproject.ui.customizer.EarProjectProperties;
70	import org.netbeans.modules.java.api.common.ant.UpdateHelper;	75	import org.netbeans.modules.java.api.common.ant.UpdateHelper;
		76	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
71	import org.netbeans.modules.web.api.webmodule.WebModule;	77	import org.netbeans.modules.web.api.webmodule.WebModule;
72	import org.netbeans.modules.web.spi.webmodule.WebModuleProvider;	78	import org.netbeans.modules.web.spi.webmodule.WebModuleProvider;
73	import org.netbeans.spi.project.ActionProvider;	79	import org.netbeans.spi.project.ActionProvider;
Lines 82-87 Link Here
82	import org.openide.util.NbBundle;	88	import org.openide.util.NbBundle;
83	import org.openide.util.Task;	89	import org.openide.util.Task;
84	import org.openide.util.TaskListener;	90	import org.openide.util.TaskListener;
		91	import org.openide.util.lookup.Lookups;
85		92
86	/**	93	/**
87	* Action provider of the Enterprise Application project.	94	* Action provider of the Enterprise Application project.
Lines 101-106 Link Here
101	COMMAND_REBUILD,	108	COMMAND_REBUILD,
102	COMMAND_RUN,	109	COMMAND_RUN,
103	COMMAND_DEBUG,	110	COMMAND_DEBUG,
		111	COMMAND_PROFILE,
104	EjbProjectConstants.COMMAND_REDEPLOY,	112	EjbProjectConstants.COMMAND_REDEPLOY,
105	COMMAND_VERIFY,	113	COMMAND_VERIFY,
106	COMMAND_DELETE,	114	COMMAND_DELETE,
Lines 124-129 Link Here
124	commands.put(COMMAND_REBUILD, new String[] {"clean", "dist"}); // NOI18N	132	commands.put(COMMAND_REBUILD, new String[] {"clean", "dist"}); // NOI18N
125	commands.put(COMMAND_RUN, new String[] {"run"}); // NOI18N	133	commands.put(COMMAND_RUN, new String[] {"run"}); // NOI18N
126	commands.put(COMMAND_DEBUG, new String[] {"debug"}); // NOI18N	134	commands.put(COMMAND_DEBUG, new String[] {"debug"}); // NOI18N
		135	commands.put(COMMAND_PROFILE, new String[]{"profile"}); // NOI18N
127	commands.put(EjbProjectConstants.COMMAND_REDEPLOY, new String[] {"run-deploy"}); // NOI18N	136	commands.put(EjbProjectConstants.COMMAND_REDEPLOY, new String[] {"run-deploy"}); // NOI18N
128	commands.put(COMMAND_DEBUG, new String[] {"debug"}); // NOI18N	137	commands.put(COMMAND_DEBUG, new String[] {"debug"}); // NOI18N
129	commands.put(COMMAND_COMPILE, new String[] {"compile"}); // NOI18N	138	commands.put(COMMAND_COMPILE, new String[] {"compile"}); // NOI18N
Lines 281-292 Link Here
281	}	290	}
282	p.setProperty("ear.docbase.dirs", edbd.toString()); // NOI18N	291	p.setProperty("ear.docbase.dirs", edbd.toString()); // NOI18N
283	}	292	}
		293	// PROFILING PART
		294	} else if (command.equals (COMMAND_PROFILE)) {
		295	// TODO This is basically a copy of the debugging part for now. Figure out what to do here!
		296
		297	if (!isSelectedServer ()) {
		298	// no selected server => warning
		299	String msg = NbBundle.getMessage(
		300	EarActionProvider.class, "MSG_No_Server_Selected"); // NOI18N
		301	DialogDisplayer.getDefault().notify(
		302	new NotifyDescriptor.Message(msg, NotifyDescriptor.WARNING_MESSAGE));
		303	return null;
		304	}
		305	setDirectoryDeploymentProperty(p);
		306	//
		307	// if (isDebugged()) {
		308	// p.setProperty("is.debugged", "true"); // NOI18N
		309	// }
		310
		311	SubprojectProvider spp = project.getLookup().lookup(SubprojectProvider.class);
		312	if (null != spp) {
		313	StringBuilder edbd = new StringBuilder();
		314	final Set s = spp.getSubprojects();
		315	Iterator iter = s.iterator();
		316	while (iter.hasNext()) {
		317	Project proj = (Project) iter.next();
		318	WebModuleProvider wmp = proj.getLookup().lookup(WebModuleProvider.class);
		319	if (null != wmp) {
		320	WebModule wm = wmp.findWebModule(proj.getProjectDirectory());
		321	if (null != wm) {
		322	FileObject fo = wm.getDocumentBase();
		323	if (null != fo) {
		324	edbd.append(FileUtil.toFile(fo).getAbsolutePath()+":"); //NOI18N
		325	}
		326	}
		327	}
		328	}
		329	p.setProperty("ear.docbase.dirs", edbd.toString()); // NOI18N
		330	}
284	//COMPILATION PART	331	//COMPILATION PART
285	} else {	332	} else {
286	if (targetNames == null) {	333	if (targetNames == null) {
287	throw new IllegalArgumentException(command);	334	throw new IllegalArgumentException(command);
288	}	335	}
289	}	336	}
		337
		338	collectStartupExtenderArgs(p, command);
290		339
291	return targetNames;	340	return targetNames;
292	}	341	}
Lines 402-405 Link Here
402	private boolean isCosEnabled() {	451	private boolean isCosEnabled() {
403	return Boolean.parseBoolean(project.evaluator().getProperty(EarProjectProperties.J2EE_COMPILE_ON_SAVE));	452	return Boolean.parseBoolean(project.evaluator().getProperty(EarProjectProperties.J2EE_COMPILE_ON_SAVE));
404	}	453	}
		454
		455	private void collectStartupExtenderArgs(Map p, String command) {
		456	StringBuilder b = new StringBuilder();
		457	for (String arg : runJvmargsIde(command)) {
		458	b.append(' ').append(arg);
		459	}
		460	if (b.length() > 0) {
		461	p.put("run.jvmargs.ide", b.toString()); // NOI18N
		462	}
		463	}
		464
		465	private List<String> runJvmargsIde(String command) {
		466	StartupExtender.StartMode mode;
		467	if (command.equals(COMMAND_RUN) \|\| command.equals(COMMAND_RUN_SINGLE)) {
		468	mode = StartupExtender.StartMode.NORMAL;
		469	} else if (command.equals(COMMAND_DEBUG) \|\| command.equals(COMMAND_DEBUG_SINGLE) \|\| command.equals(COMMAND_DEBUG_STEP_INTO)) {
		470	mode = StartupExtender.StartMode.DEBUG;
		471	} else if (command.equals(COMMAND_PROFILE) \|\| command.equals(COMMAND_PROFILE_SINGLE)) {
		472	mode = StartupExtender.StartMode.PROFILE;
		473	} else if (command.equals(COMMAND_TEST) \|\| command.equals(COMMAND_TEST_SINGLE)) {
		474	mode = StartupExtender.StartMode.TEST_NORMAL;
		475	} else if (command.equals(COMMAND_DEBUG_TEST_SINGLE)) {
		476	mode = StartupExtender.StartMode.TEST_DEBUG;
		477	} else if (command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
		478	mode = StartupExtender.StartMode.TEST_PROFILE;
		479	} else {
		480	return Collections.emptyList();
		481	}
		482	List<String> args = new ArrayList<String>();
		483	JavaPlatform p = getActivePlatform();
		484	for (StartupExtender group : StartupExtender.getExtenders(Lookups.fixed(project, p != null ? p : JavaPlatformManager.getDefault().getDefaultPlatform()), mode)) {
		485	args.addAll(group.getArguments());
		486	}
		487	return args;
		488	}
		489
		490	private JavaPlatform getActivePlatform() {
		491	return CommonProjectUtils.getActivePlatform(project.evaluator().getProperty("platform.active"));
		492	}
405	}	493	}




                </fail>
                <taskdef resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml" classpath="${{libs.CopyLibs.classpath}}"/>
            </target>
            
            <xsl:comment>
                pre NB7.2 profiling section; consider it deprecated
            </xsl:comment>
            <target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-check">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>

            <target name="-profile-pre-init">
                <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
                <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>

            <target name="-profile-post-init">
                <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
                <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>
            <target name="-profile-init-check">
                <xsl:attribute name="depends">-profile-pre-init, init, -profile-post-init</xsl:attribute>
                <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
                <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>
            <xsl:comment>
                end of pre NB7.2 profiling section
            </xsl:comment>
            
            <target name="init">
                <xsl:attribute name="depends">pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,-init-taskdefs</xsl:attribute>
            </target>

    =================
    </xsl:comment>

    <xsl:comment>
        pre NB7.2 profiling section; consider it deprecated
    </xsl:comment>
    <target name="-profile-pre72">
        <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
        <xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
        <condition>
            <xsl:attribute name="property">profiler.startserver.target</xsl:attribute>

            <xsl:attribute name="target">run</xsl:attribute>
        </antcall>
        <antcall>
            <xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
        </antcall>
    </target>


            </jvmarg>
        </nbstartprofiledserver>
    </target>
    <xsl:comment>
        end of pre NB7.2 profiling section
    </xsl:comment>

            <target name="-profile-check" if="netbeans.home">
                <condition property="profiler.configured">
                    <or>
                        <contains string="${{run.jvmargs.ide}}" substring="-agentpath:" casesensitive="false"/>
                        <contains string="${{run.jvmargs.ide}}" substring="-javaagent:" casesensitive="false"/>
                    </or>
                </condition>
            </target>

            <target name="profile" depends="-profile-check,dist,-profile-pre72" if="profiler.configured">
                <xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
                
                <startprofiler/>
                <nbstartserver profilemode="true"/>
                
                <nbdeploy profilemode="true" clientUrlPart="${{client.urlPart}}" forceRedeploy="true" />
                <antcall>
                    <xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
                </antcall>
            </target>

            <target name="-profile-start-loadgen" if="profiler.loadgen.path">
                <loadgenstart>
                    <xsl:attribute name="path">${profiler.loadgen.path}</xsl:attribute>
                </loadgenstart>
            </target>

    <xsl:comment>
    CLEANUP SECTION

Lines 174-181 Link Here

(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml (-2 / +2 lines)
174	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>	174	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>
175	<attr name="position" intvalue="900"/>	175	<attr name="position" intvalue="900"/>
176	</file>	176	</file>
177	<file name="Profiler_Actions_temporary.shadow">	177	<file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.shadow">
178	<attr name="originalFile" stringvalue="Projects/Profiler_Actions_temporary"/>	178	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-actions-ProfileProjectPopup.instance"/>
179	<attr name="position" intvalue="1000"/>	179	<attr name="position" intvalue="1000"/>
180	</file>	180	</file>
181	<file name="sep-3.instance">	181	<file name="sep-3.instance">




import org.netbeans.api.debugger.DebuggerManager;
import org.netbeans.api.debugger.Session;
import org.netbeans.api.debugger.jpda.AttachingDICookie;
import org.netbeans.api.j2ee.core.Profile;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.java.project.runner.JavaRunner;

        COMMAND_RUN_SINGLE,
        COMMAND_DEBUG,
        COMMAND_DEBUG_SINGLE,
        COMMAND_PROFILE,
        COMMAND_PROFILE_SINGLE,
        EjbProjectConstants.COMMAND_REDEPLOY,
        JavaProjectConstants.COMMAND_JAVADOC,
        COMMAND_TEST,
        COMMAND_TEST_SINGLE,
        COMMAND_DEBUG_TEST_SINGLE,
        COMMAND_PROFILE_TEST_SINGLE,
        SingleMethod.COMMAND_RUN_SINGLE_METHOD,
        SingleMethod.COMMAND_DEBUG_SINGLE_METHOD,
        JavaProjectConstants.COMMAND_DEBUG_FIX,

        COMMAND_COMPILE_SINGLE,
        COMMAND_RUN_SINGLE,
        COMMAND_DEBUG_SINGLE,
        COMMAND_PROFILE_SINGLE,
        JavaProjectConstants.COMMAND_JAVADOC,
        COMMAND_TEST,
        COMMAND_TEST_SINGLE,
        COMMAND_DEBUG_TEST_SINGLE,
        COMMAND_PROFILE_TEST_SINGLE,
        SingleMethod.COMMAND_RUN_SINGLE_METHOD,
        SingleMethod.COMMAND_DEBUG_SINGLE_METHOD
    };

    private final EjbJarProject project;

        commands.put(COMMAND_RUN_SINGLE, new String[] {"run-main"}); // NOI18N
        commands.put(EjbProjectConstants.COMMAND_REDEPLOY, new String[] {"run"}); // NOI18N
        commands.put(COMMAND_DEBUG, new String[] {"debug"}); // NOI18N
        commands.put(COMMAND_PROFILE, new String[]{"profile"}); // NOI18N
        commands.put(JavaProjectConstants.COMMAND_JAVADOC, new String[] {"javadoc"}); // NOI18N
        commands.put(COMMAND_TEST, new String[] {"test"}); // NOI18N
        commands.put(COMMAND_TEST_SINGLE, new String[] {"test-single"}); // NOI18N

        commands.put(JavaProjectConstants.COMMAND_DEBUG_FIX, new String[] {"debug-fix"}); // NOI18N
        commands.put(COMMAND_VERIFY, new String[] {"verify"}); // NOI18N
        commands.put(COMMAND_DEBUG_SINGLE, new String[] {"debug-single"}); // NOI18N
        commands.put(COMMAND_PROFILE_SINGLE, new String[]{"profile-single"}); // NOI18N
        this.bkgScanSensitiveActions = new HashSet<String>(Arrays.asList(
            COMMAND_RUN_SINGLE
        ));

    protected void updateJavaRunnerClasspath(String command, Map<String, Object> execProperties) {
        if (COMMAND_TEST_SINGLE.equals(command) || COMMAND_DEBUG_TEST_SINGLE.equals(command) ||
            SingleMethod.COMMAND_DEBUG_SINGLE_METHOD.equals(command) || SingleMethod.COMMAND_RUN_SINGLE_METHOD.equals(command) ||
            COMMAND_RUN_SINGLE.equals(command) || COMMAND_DEBUG_SINGLE.equals(command) ||
            COMMAND_PROFILE_SINGLE.equals(command) || COMMAND_PROFILE_TEST_SINGLE.equals(command)) {
            FileObject fo = (FileObject)execProperties.get(JavaRunner.PROP_EXECUTE_FILE);
            ClassPath cp = getCallback().findClassPath(fo, ClassPath.EXECUTE);
            ClassPath cp2 = ClassPathFactory.createClassPath(

        if (command.equals(COMMAND_RUN_SINGLE) ||command.equals(COMMAND_RUN) ||
            command.equals(EjbProjectConstants.COMMAND_REDEPLOY) ||command.equals(COMMAND_DEBUG) ||
            command.equals(COMMAND_DEBUG_SINGLE) || command.equals(JavaProjectConstants.COMMAND_DEBUG_FIX) ||
            command.equals( COMMAND_TEST_SINGLE) || command.equals(COMMAND_DEBUG_TEST_SINGLE) ||
            command.equals(COMMAND_PROFILE) || command.equals(COMMAND_PROFILE_SINGLE) ||
            command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
            setDirectoryDeploymentProperty(p);
        }
        if (command.equals(COMMAND_RUN) || command.equals(EjbProjectConstants.COMMAND_REDEPLOY)) {




                            <jvmarg line="${{endorsed.classpath.cmd.line.arg}}"/>
                            <jvmarg value="-ea"/>
                            <jvmarg line="${{runmain.jvmargs}}"/>
                            <jvmarg line="${{run.jvmargs.ide}}"/>
                        </junit>
                    </sequential>
                </macrodef>

            <target name="-init-ap-cmdline" depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported">
                <property name="ap.cmd.line.internal" value=""/>
            </target>
            
            <xsl:comment>
                pre NB7.2 profiling section; consider it deprecated
            </xsl:comment>
            <target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-check">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>

            <target name="-profile-pre-init">
                <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
                <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>

            <target name="-profile-post-init">
                <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
                <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>
            <target name="-profile-init-check">
                <xsl:attribute name="depends">-profile-pre-init, init, -profile-post-init</xsl:attribute>
                <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
                <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>
            <xsl:comment>
                end of pre NB7.2 profiling section
            </xsl:comment>

            <target name="init">
                <xsl:attribute name="depends">-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline</xsl:attribute>

            =================
            </xsl:comment>

            <xsl:comment>
                pre NB7.2 profiling section; consider it deprecated
            </xsl:comment>
            <target name="-profile-pre72">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
                <xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
                <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
                <condition>
                    <xsl:attribute name="property">profiler.startserver.target</xsl:attribute>
                    <xsl:attribute name="value">start-profiled-server-extraargs</xsl:attribute>

                    <xsl:attribute name="target">run</xsl:attribute>
                </antcall>
                <antcall>
                    <xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
                </antcall>
            </target>
            
            <target name="-profile-test-single-pre72">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
                <xsl:attribute name="depends">profile-init,compile-test-single</xsl:attribute>
                <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
                <nbprofiledirect>
                    <classpath>
                        <path path="${{run.test.classpath}}"/>
                        <path path="${{j2ee.platform.classpath}}"/>
                    </classpath>
                </nbprofiledirect>

                <junit showoutput="true" fork="true" dir="${{profiler.info.dir}}"  jvm="${{profiler.info.jvm}}" failureproperty="tests.failed" errorproperty="tests.failed">
                    <env key="${{profiler.info.pathvar}}" path="${{profiler.info.agentpath}}:${{profiler.current.path}}"/>
                    <jvmarg value="${{profiler.info.jvmargs.agent}}" />
                    <jvmarg line="${{profiler.info.jvmargs}}"/>
                    <test name="${{profile.class}}"/>
                    <classpath>
                        <path path="${{run.test.classpath}}"/>
                        <path path="${{j2ee.platform.classpath}}"/>
                    </classpath>
                    <syspropertyset>
                        <propertyref prefix="test-sys-prop."/>
                        <mapper type="glob" from="test-sys-prop.*" to="*"/>
                    </syspropertyset>
                    <formatter type="brief" usefile="false"/>
                    <formatter type="xml"/>
                </junit>
            </target>

            <target name="start-profiled-server">
                <nbstartprofiledserver>

                    </jvmarg>
                </nbstartprofiledserver>
            </target>
            <xsl:comment>
                end of pre NB7.2 profiling section
            </xsl:comment>

            <target name="-profile-check" if="netbeans.home">
                <condition property="profiler.configured">
                    <or>
                        <contains string="${{run.jvmargs.ide}}" substring="-agentpath:" casesensitive="false"/>
                        <contains string="${{run.jvmargs.ide}}" substring="-javaagent:" casesensitive="false"/>
                    </or>
                </condition>
            </target>

            <target name="profile" depends="-profile-check,init,compile,dist-directory-deploy,-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent">
                <xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
                
                <startprofiler/>
                <nbstartserver profilemode="true"/>
                
                <nbdeploy profilemode="true" clientUrlPart="${client.urlPart}" forceRedeploy="true" />
                <antcall>
                    <xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
                </antcall>
            </target>
            
            <target name="profile-test-single" depends="-profile-test-single-pre72"/>
            
            <target name="profile-test" depends="-profile-check" if="profiler.configured" unless="profiler.info.jvmargs.agent">
                <startprofiler/>
                <antcall target="test-single"/>
            </target>

            <target name="-profile-start-loadgen" if="profiler.loadgen.path">
                <loadgenstart>
                    <xsl:attribute name="path">${profiler.loadgen.path}</xsl:attribute>
                </loadgenstart>
            </target>

            <xsl:comment>

                <xsl:attribute name="depends">init,-pre-debug-fix,-do-debug-fix-test</xsl:attribute>
            </target>

        <xsl:comment>
        =========================
        TESTS PROFILING  SECTION
        =========================
        </xsl:comment>

          <target name="profile-test-single">
              <xsl:attribute name="if">netbeans.home</xsl:attribute>
              <xsl:attribute name="depends">profile-init,compile-test-single</xsl:attribute>
              <nbprofiledirect>
                  <classpath>
                      <path path="${{run.test.classpath}}"/>
                      <path path="${{j2ee.platform.classpath}}"/>
                  </classpath>
              </nbprofiledirect>

              <junit showoutput="true" fork="true" dir="${{profiler.info.dir}}"  jvm="${{profiler.info.jvm}}" failureproperty="tests.failed" errorproperty="tests.failed">
                  <env key="${{profiler.info.pathvar}}" path="${{profiler.info.agentpath}}:${{profiler.current.path}}"/>
                  <jvmarg value="${{profiler.info.jvmargs.agent}}" />
                  <jvmarg line="${{profiler.info.jvmargs}}"/>
                  <test name="${{profile.class}}"/>
                  <classpath>
                      <path path="${{run.test.classpath}}"/>
                      <path path="${{j2ee.platform.classpath}}"/>
                  </classpath>
                  <syspropertyset>
                      <propertyref prefix="test-sys-prop."/>
                      <mapper type="glob" from="test-sys-prop.*" to="*"/>
                  </syspropertyset>
                  <formatter type="brief" usefile="false"/>
                  <formatter type="xml"/>
              </junit>
          </target>


            <xsl:comment>
                CLEANUP SECTION
            </xsl:comment>

Lines 168-175 Link Here

(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml (-2 / +2 lines)
168	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>	168	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>
169	<attr name="position" intvalue="900"/>	169	<attr name="position" intvalue="900"/>
170	</file>	170	</file>
171	<file name="Profiler_Actions_temporary.shadow">	171	<file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.shadow">
172	<attr name="originalFile" stringvalue="Projects/Profiler_Actions_temporary"/>	172	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-actions-ProfileProjectPopup.instance"/>
173	<attr name="position" intvalue="1000"/>	173	<attr name="position" intvalue="1000"/>
174	</file>	174	</file>
175	<file name="org-netbeans-modules-project-ui-TestProject.shadow">	175	<file name="org-netbeans-modules-project-ui-TestProject.shadow">




import org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener.Artifact;
import org.netbeans.modules.j2ee.deployment.plugins.spi.JDBCDriverDeployer;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;

                    int oldState = getServerState();
                    setServerState(STATE_WAITING);
                    if (ServerInstance.this == profiledServerInstance) {
                        updateStateFromProfiler();
                        return;
                            setServerState(ServerInstance.STATE_PROFILER_STARTING);
                            return;
                        } else if (profState == ProfilerSupport.STATE_BLOCKING) {
                            setServerState(ServerInstance.STATE_PROFILER_BLOCKING);
                            return;
                        } else if (profState == ProfilerSupport.STATE_PROFILING
                                   || profState == ProfilerSupport.STATE_RUNNING) {
                            initCoTarget();
                            setServerState(ServerInstance.STATE_PROFILING);
                            return;
                        } else {
                            //  profiler is inactive - has been shutdown
                            profiledServerInstance = null;
                        }
                    }
                    if (isSuspended()) {
                        setServerState(ServerInstance.STATE_SUSPENDED);

            profiledServerInstance = null;
        }
        
        final Profiler profiler = ServerRegistry.getProfiler();
        if (profiler == null) {
            // this should not occur, but better make sure
            throw new ServerException(NbBundle.getMessage(ServerInstance.class, "MSG_ProfilerNotRegistered"));
        }
        
        final ScheduledExecutorService statusUpdater = Executors.newSingleThreadScheduledExecutor();
        statusUpdater.scheduleAtFixedRate(new Runnable() {

            @Override
            public void run() {
                updateStateFromProfiler();
            }
        }, 50, 100, TimeUnit.MILLISECONDS);
        
        final StateListener l = new StateListener() {

            @Override
            public void stateChanged(int oldState, int newState) {
                if (oldState != newState && newState == STATE_STOPPED) {
                    ServerInstance.this.removeStateListener(this);
                    statusUpdater.shutdownNow();
                    profiledServerInstance = null;
                }
            }
        };
        
        this.addStateListener(l);
        
        profiler.notifyStarting();
        ProgressObject po = getStartServer().startProfiling(target);
        try {

            }
        }
    }
    
    private void updateStateFromProfiler() {
        int profState = ProfilerSupport.getState();
        if (profState == ProfilerSupport.STATE_STARTING) {
            setServerState(ServerInstance.STATE_PROFILER_STARTING);
        } else if (profState == ProfilerSupport.STATE_BLOCKING) {
            setServerState(ServerInstance.STATE_PROFILER_BLOCKING);
        } else if (profState == ProfilerSupport.STATE_PROFILING
                    || profState == ProfilerSupport.STATE_RUNNING) {
            initCoTarget();
            setServerState(ServerInstance.STATE_PROFILING);
        } else {
            setServerState(ServerInstance.STATE_STOPPED);
        }
    }
}




                        }
                    }

                    if (targetNames.length == 1 && (JavaRunner.QUICK_RUN_APPLET.equals(targetNames[0]) || JavaRunner.QUICK_DEBUG_APPLET.equals(targetNames[0]) || JavaRunner.QUICK_PROFILE_APPLET.equals(targetNames[0]))) {
                        try {
                            final FileObject[] selectedFiles = findSources(context);
                            if (selectedFiles != null) {

                                String url = p.getProperty("applet.url");
                                execProperties.put("applet.url", url);
                                execProperties.put(JavaRunner.PROP_EXECUTE_FILE, file);
                                prepareSystemProperties(execProperties, command, false);
                                JavaRunner.execute(targetNames[0], execProperties);
                            }
                        } catch (IOException ex) {

                        }
                        return;
                    }
                    if (!isServerExecution() && (COMMAND_RUN.equals(command) || COMMAND_DEBUG.equals(command) || COMMAND_DEBUG_STEP_INTO.equals(command) || COMMAND_PROFILE.equals(command))) {
                        prepareSystemProperties(execProperties, command, false);
                        bypassAntBuildScript(command, context, execProperties);
                        return ;
                    }
                    // for example RUN_SINGLE Java file with Servlet must be run on server and not locally
                    boolean serverExecution = p.getProperty(PROPERTY_RUN_SINGLE_ON_SERVER) != null;
                    p.remove(PROPERTY_RUN_SINGLE_ON_SERVER);
                    if (!serverExecution && (COMMAND_RUN_SINGLE.equals(command) || COMMAND_DEBUG_SINGLE.equals(command) || COMMAND_PROFILE_SINGLE.equals(command))) {
                        prepareSystemProperties(execProperties, command, false);
                        if (COMMAND_RUN_SINGLE.equals(command)) {
                            execProperties.put(JavaRunner.PROP_CLASSNAME, p.getProperty("run.class"));
                        } else if (COMMAND_DEBUG_SINGLE.equals(command)) {
                            execProperties.put(JavaRunner.PROP_CLASSNAME, p.getProperty("debug.class")); 
                        } else {
                            execProperties.put(JavaRunner.PROP_CLASSNAME, p.getProperty("profile.class"));
                        }
                        bypassAntBuildScript(command, context, execProperties);
                        return;
                    }
                    if (COMMAND_TEST_SINGLE.equals(command) || COMMAND_DEBUG_TEST_SINGLE.equals(command) || COMMAND_PROFILE_TEST_SINGLE.equals(command)) {
                        FileObject[] files = findTestSources(context, true);
                        try {
                            prepareSystemProperties(execProperties, command, true);
                            execProperties.put(JavaRunner.PROP_EXECUTE_FILE, files[0]);
                            execProperties.put("tmp.dir", updateHelper.getAntProjectHelper().resolvePath(evaluator.getProperty(ProjectProperties.BUILD_DIR)));   //NOI18N
                            updateJavaRunnerClasspath(command, execProperties);
                            JavaRunner.execute(COMMAND_TEST_SINGLE.equals(command) ? JavaRunner.QUICK_TEST : (COMMAND_DEBUG_TEST_SINGLE.equals(command) ? JavaRunner.QUICK_TEST_DEBUG : JavaRunner.QUICK_TEST_PROFILE), execProperties);
                        } catch (IOException ex) {
                            Exceptions.printStackTrace(ex);
                        }

                    if (SingleMethod.COMMAND_RUN_SINGLE_METHOD.equals(command) || SingleMethod.COMMAND_DEBUG_SINGLE_METHOD.equals(command)) {
                        SingleMethod methodSpec = findTestMethods(context)[0];
                        try {
                            prepareSystemProperties(execProperties, command, false);
                            execProperties.put("methodname", methodSpec.getMethodName());//NOI18N
                            execProperties.put(JavaRunner.PROP_EXECUTE_FILE, methodSpec.getFile());
                            execProperties.put("tmp.dir",updateHelper.getAntProjectHelper().resolvePath(evaluator.getProperty(ProjectProperties.BUILD_DIR)));   //NOI18N
                            updateJavaRunnerClasspath(command, execProperties);
                            JavaRunner.execute(command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) ? JavaRunner.QUICK_TEST : (SingleMethod.COMMAND_DEBUG_SINGLE_METHOD.equals(command) ? JavaRunner.QUICK_TEST_DEBUG :JavaRunner.QUICK_TEST_PROFILE),
                                               execProperties);
                        } catch (IOException ex) {
                            Exceptions.printStackTrace(ex);
                        }
                        return;
                    }
                }
                collectStartupExtenderArgs(p, command);
                for (String arg : runJvmargsIde()) {
                    b.append(' ').append(arg);
                }
                if (b.length() > 0) {
                    p.put(ProjectProperties.RUN_JVM_ARGS_IDE, b.toString());
                }
                if (targetNames.length == 0) {
                    targetNames = null;
                }

                    ErrorManager.getDefault().notify(e);
                }
            }

            private List<String> runJvmargsIde() {
                StartupExtender.StartMode mode;
                if (command.equals(COMMAND_RUN) || command.equals(COMMAND_RUN_SINGLE)) {
                    mode = StartupExtender.StartMode.NORMAL;
                } else if (command.equals(COMMAND_DEBUG) || command.equals(COMMAND_DEBUG_SINGLE) || command.equals(COMMAND_DEBUG_STEP_INTO)) {
                    mode = StartupExtender.StartMode.DEBUG;
                } else if (command.equals("profile")) {
                    mode = StartupExtender.StartMode.PROFILE;
                } else if (command.equals(COMMAND_TEST) || command.equals(COMMAND_TEST_SINGLE)) {
                    mode = StartupExtender.StartMode.TEST_NORMAL;
                } else if (command.equals(COMMAND_DEBUG_TEST_SINGLE)) {
                    mode = StartupExtender.StartMode.TEST_DEBUG;
                } else if (command.equals("profile-test-single")) {
                    mode = StartupExtender.StartMode.TEST_PROFILE;
                } else {
                    return Collections.emptyList();
                }
                List<String> args = new ArrayList<String>();
                JavaPlatform p = getActivePlatform();
                for (StartupExtender group : StartupExtender.getExtenders(Lookups.fixed(project, p != null ? p : JavaPlatformManager.getDefault().getDefaultPlatform()), mode)) {
                    args.addAll(group.getArguments());
                }
                return args;
            }

        }
        final Action action = new Action();


                return null;
            }
            targetNames = setupDebugTestSingle(p, files);
        } else if ( command.equals( COMMAND_PROFILE_TEST_SINGLE ) ) {
            final FileObject[] files = findTestSources(context, true);
            if (files == null) {
                return null;
            }
            targetNames = setupProfileTestSingle(p, files);
        } else if ( command.equals( SingleMethod.COMMAND_RUN_SINGLE_METHOD ) ) {
            SingleMethod[] methodSpecs = findTestMethods(context);
            if ((methodSpecs == null) || (methodSpecs.length != 1)) {

            }
            p.setProperty("fix.includes", path); // NOI18N
            p.setProperty("fix.classes", classes); // NOI18N
        } else if (!isServerExecution() && (command.equals (COMMAND_RUN) || command.equals(COMMAND_DEBUG) || command.equals(COMMAND_DEBUG_STEP_INTO) || command.equals(COMMAND_PROFILE))) {
            String config = evaluator.getProperty(ProjectProperties.PROP_PROJECT_CONFIGURATION_CONFIG);
            String path;
            if (config == null || config.length() == 0) {

                }
            }
            if (!command.equals(COMMAND_RUN) && /* XXX should ideally look up proper mainClass in evaluator x config */ mainClass != null) {
                if (command.equals(COMMAND_PROFILE)) {
                    p.setProperty("run.class", mainClass); // NOI18N
                } else {
                    p.setProperty("debug.class", mainClass); // NOI18N
                }
            }
            String[] targets = targetsFromConfig.get(command);
            targetNames = (targets != null) ? targets : getCommands().get(command);

                throw new IllegalArgumentException(command);
            }
            prepareDirtyList(p, false);
        } else if (command.equals (COMMAND_RUN_SINGLE) || command.equals (COMMAND_DEBUG_SINGLE) || command.equals(COMMAND_PROFILE_SINGLE)) {
            FileObject[] files = findTestSources(context, false);
            FileObject[] rootz = projectTestRoots.getRoots();
            boolean isTest = true;

                            return null;
                        }
                        p.setProperty("applet.url", url.toString()); // NOI18N
                        if (COMMAND_RUN_SINGLE.equals(command)) {
                            targetNames = new String[] {"run-applet"}; // NOI18N
                        } else if (COMMAND_DEBUG_SINGLE.equals(command)) {
                            p.setProperty("debug.class", clazz); // NOI18N
                            targetNames = new String[] {"debug-applet"}; // NOI18N
                        } else if (COMMAND_PROFILE_SINGLE.equals(command)) {
                            p.setProperty("run.class", clazz); // NOI18N
                            targetNames = new String[]{"profile-applet"}; // NOI18N
                        }
                    } else {
                        List<String> alternativeTargetNames = new ArrayList<String>();

                            //Fallback to normal (non-main-method-based) unit test run
                            if (command.equals(COMMAND_RUN_SINGLE)) {
                                targetNames = setupTestSingle(p, files);
                            } else if (command.equals(COMMAND_DEBUG_SINGLE)) {
                                targetNames = setupDebugTestSingle(p, files);
                            } else {
                                targetNames = setupProfileTestSingle(p, files);
                            }
                        } else if (handleJavaClass(p, file, command, alternativeTargetNames)) {
                            if (alternativeTargetNames.size() > 0) {

                        p.setProperty("run.class", clazz); // NOI18N
                        String[] targets = targetsFromConfig.get(command);
                        targetNames = (targets != null) ? targets : (isTest ? new String[] { "run-test-with-main" } : getCommands().get(COMMAND_RUN_SINGLE));
                    } else if (command.equals(COMMAND_DEBUG_SINGLE)) {
                        p.setProperty("debug.class", clazz); // NOI18N
                        String[] targets = targetsFromConfig.get(command);
                        targetNames = (targets != null) ? targets : (isTest ? new String[] {"debug-test-with-main"} : getCommands().get(COMMAND_DEBUG_SINGLE));
                    } else {
                        p.setProperty("run.class", clazz); // NOI18N
                        String[] targets = targetsFromConfig.get(command);
                        targetNames = (targets != null) ? targets : (isTest ? new String[] {"profile-test-with-main"} : getCommands().get(COMMAND_PROFILE_SINGLE));
                    }
                }
            }

                        p.setProperty("run.class", clazz); // NOI18N
                        String[] targets = targetsFromConfig.get(command);
                        targetNames = (targets != null) ? targets : (isTest ? new String[] { "run-test-with-main" } : getCommands().get(COMMAND_RUN_SINGLE));    //NOI18N
                } else if (command.equals(COMMAND_DEBUG_SINGLE)) {
                    p.setProperty("debug.class", clazz); // NOI18N
                    String[] targets = targetsFromConfig.get(command);
                    targetNames = (targets != null) ? targets : (isTest ? new String[] {"debug-test-with-main"} : getCommands().get(COMMAND_DEBUG_SINGLE));      //NOI18N
                } else {
                    p.setProperty("run.class", clazz); // NOI18N
                    String[] targets = targetsFromConfig.get(command);
                    targetNames = (targets != null) ? targets : (isTest ? new String[] {"profile-test-with-main"} : getCommands().get(COMMAND_DEBUG_SINGLE));      //NOI18N
                }
            }
        } else {

                dirty = null;
            }
        }
        
        return targetNames;
    }


        p.setProperty("javac.includes", ActionUtils.antIncludesList(files, root)); // NOI18N
        return new String[] {"debug-test"}; // NOI18N
    }
    
    private String[] setupProfileTestSingle(Properties p, FileObject[] files) {
        FileObject[] testSrcPath = projectTestRoots.getRoots();
        FileObject root = getRoot(testSrcPath, files[0]);
        p.setProperty("test.includes", ActionUtils.antIncludesList(files, root)); // NOI18N
        p.setProperty("javac.includes", ActionUtils.antIncludesList(files, root)); // NOI18N
        return new String[] {"profile-test"}; // NOI18N
    }

    private String[] setupRunSingleTestMethod(Properties p, SingleMethod methodSpec) {
        return setupTestSingle(p, new FileObject[] {methodSpec.getFile()});

        else if ( command.equals( COMMAND_DEBUG_TEST_SINGLE ) ) {
            FileObject[] fos = findTestSources(context, true);
            return fos != null && fos.length == 1;
        } else if ( command.equals( COMMAND_PROFILE_TEST_SINGLE ) ) {
            FileObject[] fos = findTestSources(context, true);
            return fos != null && fos.length == 1;
        } else if (command.equals(COMMAND_RUN_SINGLE) ||
                        command.equals(COMMAND_DEBUG_SINGLE) ||
                        command.equals(COMMAND_PROFILE_SINGLE) ||
                        command.equals(JavaProjectConstants.COMMAND_DEBUG_FIX)) {
            FileObject fos[] = findSources(context);
            if (fos != null && fos.length == 1) {

        boolean run = true;
        boolean hasMainMethod = true;

        if (COMMAND_RUN.equals(command) || COMMAND_DEBUG.equals(command) || COMMAND_DEBUG_STEP_INTO.equals(command) || COMMAND_PROFILE.equals(command)) {
            final String mainClass = evaluator.getProperty(ProjectProperties.MAIN_CLASS);

            p.put(JavaRunner.PROP_CLASSNAME, mainClass);

            p.put(JavaRunner.PROP_EXECUTE_FILE, files[0]);
        }
        boolean debug = COMMAND_DEBUG.equals(command) || COMMAND_DEBUG_SINGLE.equals(command) || COMMAND_DEBUG_STEP_INTO.equals(command);
        boolean profile = COMMAND_PROFILE.equals(command) || COMMAND_PROFILE_SINGLE.equals(command);
        try {
            updateJavaRunnerClasspath(command, p);
            if (run) {
                copyMultiValue(ProjectProperties.APPLICATION_ARGS, p);
                JavaRunner.execute(debug ? JavaRunner.QUICK_DEBUG : (profile ? JavaRunner.QUICK_PROFILE : JavaRunner.QUICK_RUN), p);
            } else {
                if (hasMainMethod) {
                    JavaRunner.execute(debug ? JavaRunner.QUICK_DEBUG : (profile ? JavaRunner.QUICK_PROFILE : JavaRunner.QUICK_RUN), p);
                } else {
                    JavaRunner.execute(debug ? JavaRunner.QUICK_TEST_DEBUG : (profile ? JavaRunner.QUICK_TEST_PROFILE : JavaRunner.QUICK_TEST), p);
                }
            }
        } catch (IOException ex) {

        it.add(val);
    }

    private List<String> runJvmargsIde(String command) {
        StartupExtender.StartMode mode;
        if (command.equals(COMMAND_RUN) || command.equals(COMMAND_RUN_SINGLE)) {
            mode = StartupExtender.StartMode.NORMAL;
        } else if (command.equals(COMMAND_DEBUG) || command.equals(COMMAND_DEBUG_SINGLE) || command.equals(COMMAND_DEBUG_STEP_INTO)) {
            mode = StartupExtender.StartMode.DEBUG;
        } else if (command.equals(COMMAND_PROFILE) || command.equals(COMMAND_PROFILE_SINGLE)) {
            mode = StartupExtender.StartMode.PROFILE;
        } else if (command.equals(COMMAND_TEST) || command.equals(COMMAND_TEST_SINGLE)) {
            mode = StartupExtender.StartMode.TEST_NORMAL;
        } else if (command.equals(COMMAND_DEBUG_TEST_SINGLE)) {
            mode = StartupExtender.StartMode.TEST_DEBUG;
        } else if (command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
            mode = StartupExtender.StartMode.TEST_PROFILE;
        } else {
            return Collections.emptyList();
        }
        List<String> args = new ArrayList<String>();
        JavaPlatform p = getActivePlatform();
        for (StartupExtender group : StartupExtender.getExtenders(Lookups.fixed(project, p != null ? p : JavaPlatformManager.getDefault().getDefaultPlatform()), mode)) {
            args.addAll(group.getArguments());
        }
        return args;
    }
    
    private void collectStartupExtenderArgs(Map p, String command) {
        StringBuilder b = new StringBuilder();
        for (String arg : runJvmargsIde(command)) {
            b.append(' ').append(arg);
        }
        if (b.length() > 0) {
            p.put(ProjectProperties.RUN_JVM_ARGS_IDE, b.toString());
        }
    }
    
    private void prepareSystemProperties(Map<String, Object> properties, String command, boolean test) {
        String prefix = test ? ProjectProperties.SYSTEM_PROPERTIES_TEST_PREFIX : ProjectProperties.SYSTEM_PROPERTIES_RUN_PREFIX;
        Map<String, String> evaluated = evaluator.getProperties();


            if (e.getKey().startsWith(prefix) && e.getValue() != null) {
                putMultiValue(properties, JavaRunner.PROP_RUN_JVMARGS, "-D" + e.getKey().substring(prefix.length()) + "=" + e.getValue());
            }
        }        
        collectStartupExtenderArgs(properties, command);
    }

    private static enum MainClassStatus {

Lines 48-53 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/project/Bundle.properties (+3 lines)
48	ACTION_debug.stepinto=Debug Project	48	ACTION_debug.stepinto=Debug Project
49	ACTION_debug.fix=Apply Code Changes	49	ACTION_debug.fix=Apply Code Changes
50	ACTION_debug.test.single=Debug Test	50	ACTION_debug.test.single=Debug Test
		51	ACTION_profile=Profile Project
		52	ACTION_profile.single=Profile File
		53	ACTION_profile.test.single=Profile Test
51	ACTION_rebuild=Rebuild Project	54	ACTION_rebuild=Rebuild Project
52	ACTION_build=Build Project	55	ACTION_build=Build Project
53	ACTION_clean=Clean Project	56	ACTION_clean=Clean Project

Lines 61-66 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/Bundle.properties (+4 lines)
61	ACTION_compile.single=Compile File	61	ACTION_compile.single=Compile File
62	ACTION_run.single=Run File	62	ACTION_run.single=Run File
63	ACTION_debug.single=Debug File	63	ACTION_debug.single=Debug File
		64	ACTION_profile.single=Profile File
64	COMMENT_edit_target=TODO: edit the following target according to your needs	65	COMMENT_edit_target=TODO: edit the following target according to your needs
65	COMMENT_more_info_x.single=(more info: http://www.netbeans.org/kb/articles/freeform-config.html#compilesingle)	66	COMMENT_more_info_x.single=(more info: http://www.netbeans.org/kb/articles/freeform-config.html#compilesingle)
66	COMMENT_more_info_run.single=(more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle)	67	COMMENT_more_info_run.single=(more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle)
Lines 74-79 Link Here
74	COMMENT_set_runtime_cp=TODO configure the runtime classpath for your project here:	75	COMMENT_set_runtime_cp=TODO configure the runtime classpath for your project here:
75	COMMENT_set_main_class=TODO configure the main class for your project here:	76	COMMENT_set_main_class=TODO configure the main class for your project here:
76		77
		78	ACTION_profile=Profile Project
		79	COMMENT_more_info_profile=(more info: http://www.netbeans.org/kb/articles/<freeform-config.html#debugj2se>)
		80
77	CTL_SetOutput=Set Output	81	CTL_SetOutput=Set Output
78	AD_SetOutput=N/A	82	AD_SetOutput=N/A
79	# {0} - action display name	83	# {0} - action display name

Lines 118-125 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/JavaActions.java (-1 / +223 lines)
118	private static final String[] ACTIONS = {	118	private static final String[] ACTIONS = {
119	ActionProvider.COMMAND_COMPILE_SINGLE,	119	ActionProvider.COMMAND_COMPILE_SINGLE,
120	ActionProvider.COMMAND_DEBUG,	120	ActionProvider.COMMAND_DEBUG,
		121	ActionProvider.COMMAND_PROFILE,
121	ActionProvider.COMMAND_RUN_SINGLE,	122	ActionProvider.COMMAND_RUN_SINGLE,
122	ActionProvider.COMMAND_DEBUG_SINGLE	123	ActionProvider.COMMAND_DEBUG_SINGLE,
		124	ActionProvider.COMMAND_PROFILE_SINGLE
123	// XXX more	125	// XXX more
124	};	126	};
125		127
Lines 162-171 Link Here
162	return findPackageRoot(context) != null;	164	return findPackageRoot(context) != null;
163	} else if (command.equals(ActionProvider.COMMAND_DEBUG)) {	165	} else if (command.equals(ActionProvider.COMMAND_DEBUG)) {
164	return true;	166	return true;
		167	} else if (command.equals(ActionProvider.COMMAND_PROFILE)) {
		168	return true;
165	} else if (command.equals(ActionProvider.COMMAND_RUN_SINGLE)) {	169	} else if (command.equals(ActionProvider.COMMAND_RUN_SINGLE)) {
166	return (findPackageRoot(context) != null) && isSingleJavaFileSelected(context);	170	return (findPackageRoot(context) != null) && isSingleJavaFileSelected(context);
167	} else if (command.equals(ActionProvider.COMMAND_DEBUG_SINGLE)) {	171	} else if (command.equals(ActionProvider.COMMAND_DEBUG_SINGLE)) {
168	return (findPackageRoot(context) != null) && isSingleJavaFileSelected(context);	172	return (findPackageRoot(context) != null) && isSingleJavaFileSelected(context);
		173	} else if (command.equals(ActionProvider.COMMAND_PROFILE_SINGLE)) {
		174	return (findPackageRoot(context) != null) && isSingleJavaFileSelected(context);
169	} else {	175	} else {
170	throw new IllegalArgumentException(command);	176	throw new IllegalArgumentException(command);
171	}	177	}
Lines 180-189 Link Here
180	handleCompileSingle(context);	186	handleCompileSingle(context);
181	} else if (command.equals(ActionProvider.COMMAND_DEBUG)) {	187	} else if (command.equals(ActionProvider.COMMAND_DEBUG)) {
182	handleDebug();	188	handleDebug();
		189	} else if (command.equals(ActionProvider.COMMAND_PROFILE)) {
		190	handleProfile();
183	} else if (command.equals(ActionProvider.COMMAND_RUN_SINGLE)) {	191	} else if (command.equals(ActionProvider.COMMAND_RUN_SINGLE)) {
184	handleRunSingle(context);	192	handleRunSingle(context);
185	} else if (command.equals(ActionProvider.COMMAND_DEBUG_SINGLE)) {	193	} else if (command.equals(ActionProvider.COMMAND_DEBUG_SINGLE)) {
186	handleDebugSingle(context);	194	handleDebugSingle(context);
		195	} else if (command.equals(ActionProvider.COMMAND_PROFILE_SINGLE)) {
		196	handleProfileSingle(context);
187	} else {	197	} else {
188	throw new IllegalArgumentException(command);	198	throw new IllegalArgumentException(command);
189	}	199	}
Lines 462-467 Link Here
462	return target;	472	return target;
463	}	473	}
464		474
		475	private void handleProfile() throws IOException, SAXException {
		476	if (!this.setOutputsNotified) {
		477	ProjectModel pm = ProjectModel.createModel(Util.getProjectLocation(this.helper, this.evaluator),
		478	FileUtil.toFile(project.getProjectDirectory()), this.evaluator, this.helper);
		479	List<ProjectModel.CompilationUnitKey> cuKeys = pm.createCompilationUnitKeys();
		480	assert cuKeys != null;
		481	boolean hasOutputs = false;
		482	for (Iterator it = cuKeys.iterator(); it.hasNext();) {
		483	ProjectModel.CompilationUnitKey ck = (ProjectModel.CompilationUnitKey) it.next();
		484	JavaProjectGenerator.JavaCompilationUnit cu = pm.getCompilationUnit(ck,false);
		485	if (cu.output != null && cu.output.size()>0) {
		486	hasOutputs = true;
		487	break;
		488	}
		489	}
		490	if (!hasOutputs) {
		491	alertOutputs (NbBundle.getMessage(JavaActions.class, "ACTION_profile")); // NOI18N
		492	this.setOutputsNotified = true;
		493	return;
		494	}
		495	}
		496	String[] bindings = findCommandBinding(ActionProvider.COMMAND_RUN);
		497	Element task = null;
		498	Element origTarget = null;
		499	if (bindings != null && bindings.length <= 2) {
		500	origTarget = findExistingBuildTarget(ActionProvider.COMMAND_RUN);
		501	//The origTarget may be null if the user has removed it from build.xml
		502	if (origTarget != null) {
		503	task = targetUsesTaskExactlyOnce(origTarget, "java"); // NOI18N
		504	}
		505	}
		506
		507	if (!alert(NbBundle.getMessage(JavaActions.class, "ACTION_profile"), task != null ? GENERAL_SCRIPT_PATH : FILE_SCRIPT_PATH)) { // NOI18N
		508	return;
		509	}
		510
		511	String generatedTargetName = "profile-nb"; // NOI18N
		512	String generatedScriptPath;
		513	Document doc;
		514	Element generatedTarget;
		515	if (task != null) {
		516	// We can copy the original run target with some modifications.
		517	generatedScriptPath = GENERAL_SCRIPT_PATH;
		518	doc = readCustomScript(GENERAL_SCRIPT_PATH);
		519	ensureImports(doc.getDocumentElement(), bindings[0]);
		520	generatedTarget = createProfileTargetFromTemplate(generatedTargetName, origTarget, task, doc);
		521	} else {
		522	// No info, need to generate a dummy profile target.
		523	generatedScriptPath = FILE_SCRIPT_PATH;
		524	doc = readCustomScript(FILE_SCRIPT_PATH);
		525	ensurePropertiesCopied(doc.getDocumentElement());
		526	generatedTarget = createProfileTargetFromScratch(generatedTargetName, doc);
		527	}
		528	Comment comm = doc.createComment(" " + NbBundle.getMessage(JavaActions.class, "COMMENT_edit_target") + " "); // NOI18N
		529	doc.getDocumentElement().appendChild(comm);
		530	comm = doc.createComment(" " + NbBundle.getMessage(JavaActions.class, "COMMENT_more_info_profile") + " "); // NOI18N
		531	doc.getDocumentElement().appendChild(comm);
		532	doc.getDocumentElement().appendChild(generatedTarget);
		533	writeCustomScript(doc, generatedScriptPath);
		534	addBinding(ActionProvider.COMMAND_PROFILE, generatedScriptPath, generatedTargetName, null, null, null, null, null);
		535	jumpToBinding(ActionProvider.COMMAND_PROFILE);
		536	jumpToBuildScript(generatedScriptPath, generatedTargetName);
		537	}
		538
539	Element createProfileTargetFromTemplate(String generatedTargetName, Element origTarget, Element origTask, Document ownerDocument) {
540	NodeList tasks = origTarget.getChildNodes();
541	int taskIndex = -1;
542	for (int i = 0; i < tasks.getLength(); i++) {
543	if (tasks.item(i) == origTask) {
544	taskIndex = i;
545	break;
546	}
547	}
548	assert taskIndex != -1;
549	Element target = (Element) ownerDocument.importNode(origTarget, true);
550	target.setAttribute("depends", "-profile-check,dist"); // NOI18N
551	target.setAttribute("if", "profiler.configured"); // NOI18N
552	addJdkInitDeps(target);
553	Element task = (Element) target.getChildNodes().item(taskIndex);
554	target.setAttribute("name", generatedTargetName); // NOI18N
555	addProfileInit(ownerDocument, ownerDocument.getDocumentElement());
556
557	addProfileVMArgs(task, ownerDocument);
558	return target;
559	}
560
561	Element createProfileTargetFromScratch(String generatedTargetName, Document ownerDocument) {
562	Element target = ownerDocument.createElement("target"); // NOI18N
563	target.setAttribute("depends", "-profile-check,dist"); // NOI18N
564	target.setAttribute("if", "profiler.configured"); // NOI18N
565	addJdkInitDeps(target);
566	target.setAttribute("name", generatedTargetName); // NOI18N
567	Element path = ownerDocument.createElement("path"); // NOI18N
568	// XXX would be better to determine runtime CP from project.xml and put it here instead (if that is possible)...
569	path.setAttribute("id", "cp"); // NOI18N
570	path.appendChild(ownerDocument.createComment(" " + NbBundle.getMessage(JavaActions.class, "COMMENT_set_runtime_cp") + " ")); // NOI18N
571	target.appendChild(path);
572	addProfileInit(ownerDocument, ownerDocument.getDocumentElement());
573
574	target.appendChild(ownerDocument.createComment(" " + NbBundle.getMessage(JavaActions.class, "COMMENT_set_main_class") + " ")); // NOI18N
575	Element java = ownerDocument.createElement("java"); // NOI18N
576	java.setAttribute("classname", "some.main.Class"); // NOI18N
577	Element classpath = ownerDocument.createElement("classpath"); // NOI18N
578	classpath.setAttribute("refid", "cp"); // NOI18N
579	java.appendChild(classpath);
580	addProfileVMArgs(java, ownerDocument);
581	target.appendChild(java);
582	return target;
583	}
584
585	private void addProfileInit(Document ownerDocument, Element parent) {
586	NodeList nl = ownerDocument.getElementsByTagName("target");
587	for(int i=0;i<nl.getLength();i++) {
588	if ("-profile-check".equals(((Element)nl.item(i)).getAttribute("name"))) {
589	return;
590	}
591	}
592	Element init = ownerDocument.createElement("target"); // NOI18N
593	init.setAttribute("name", "-profile-check");
594	Element profilerStart = ownerDocument.createElement("startprofiler");
595	profilerStart.setAttribute("freeform", "true");
596	init.appendChild(profilerStart);
597
598	parent.appendChild(init);
599	}
600
601	private void addProfileVMArgs(Element java, Document ownerDocument) {
602	//Add fork="true" if not alredy there
603	NamedNodeMap attrs = java.getAttributes();
604	boolean found = false;
605	for (int i=0; i<attrs.getLength(); i++) {
606	Attr attr = (Attr) attrs.item(i);
607	if ("fork".equals(attr.getName())) { //NOI18N
608	String value = attr.getValue();
609	if ("on".equalsIgnoreCase (value) \|\| //NOI18N
610	"true".equalsIgnoreCase(value) \|\| //NOI18N
611	"yes".equalsIgnoreCase(value)) { //NOI18N
612	found = true;
613	}
614	break;
615	}
616	}
617	if (!found) {
618	java.setAttribute("fork", "true"); //NOI18N
619	}
620	Element jvmarg = ownerDocument.createElement("jvmarg"); // NOI18N
621	jvmarg.setAttribute("line", "${agent.jvmargs}"); // NOI18N
622	java.appendChild(jvmarg);
623	}
624
465	/**	625	/**
466	* Read a generated script if it exists, else create a skeleton.	626	* Read a generated script if it exists, else create a skeleton.
467	* Imports jdk.xml if appropriate.	627	* Imports jdk.xml if appropriate.
Lines 1120-1125 Link Here
1120	jumpToBinding(ActionProvider.COMMAND_DEBUG_SINGLE);	1280	jumpToBinding(ActionProvider.COMMAND_DEBUG_SINGLE);
1121	jumpToBuildScript(FILE_SCRIPT_PATH, targetName);	1281	jumpToBuildScript(FILE_SCRIPT_PATH, targetName);
1122	}	1282	}
		1283
		1284	private void handleProfileSingle(Lookup context) throws IOException, SAXException {
		1285	if (!alert(NbBundle.getMessage(JavaActions.class, "ACTION_profile.single"), FILE_SCRIPT_PATH)) { // NOI18N
		1286	return;
		1287	}
		1288	Document doc = readCustomScript(FILE_SCRIPT_PATH);
		1289	AntLocation root = handleInitials(doc, context);
		1290	assert root != null : context;
		1291	String propertyName = "profile.class"; // NOI18N
		1292	String targetName = "profile-selected-file-in-" + root.physical.getNameExt(); // NOI18N
		1293	Element targetElem = createProfileSingleTargetElem(doc, targetName, propertyName, root);
		1294	doc.getDocumentElement().appendChild(targetElem);
		1295	writeCustomScript(doc, FILE_SCRIPT_PATH);
		1296	addBinding(ActionProvider.COMMAND_PROFILE_SINGLE, FILE_SCRIPT_PATH, targetName,
		1297	propertyName, root.virtual, JAVA_FILE_PATTERN, "java-name", null); // NOI18N
		1298	jumpToBinding(ActionProvider.COMMAND_PROFILE_SINGLE);
		1299	jumpToBuildScript(FILE_SCRIPT_PATH, targetName);
		1300	}
1123		1301
1124	Element createRunSingleTargetElem(Document doc, String tgName,	1302	Element createRunSingleTargetElem(Document doc, String tgName,
1125	String propName, AntLocation root) throws IOException, SAXException {	1303	String propName, AntLocation root) throws IOException, SAXException {
Lines 1197-1202 Link Here
1197	targetElem.appendChild(javaElem);	1375	targetElem.appendChild(javaElem);
1198	return targetElem;	1376	return targetElem;
1199	}	1377	}
		1378
		1379	Element createProfileSingleTargetElem(Document doc, String tgName,
		1380	String propName, AntLocation root) throws IOException, SAXException {
		1381
		1382	Element targetElem = doc.createElement("target"); // NOI18N
		1383	addJdkInitDeps(targetElem);
		1384	targetElem.setAttribute("name", tgName); // NOI18N
		1385	targetElem.setAttribute("if", "profiler.configured"); // NOI18N
		1386	targetElem.setAttribute("depends", "-profile-check"); // NOI18N
		1387	Element failElem = doc.createElement("fail"); // NOI18N
		1388	failElem.setAttribute("unless", propName); // NOI18N
		1389	failElem.appendChild(doc.createTextNode(NbBundle.getMessage(JavaActions.class,
		1390	"COMMENT_must_set_property", propName)));
		1391	targetElem.appendChild(failElem);
		1392
		1393	String depends[] = getRunDepends();
		1394	if (depends != null) {
		1395	targetElem.appendChild(createAntElem(doc, depends[0], depends[1]));
		1396	}
		1397
		1398	Element pElem = getPathFromCU(doc, root.virtual, "path"); // NOI18N
		1399	pElem.setAttribute("id", "cp"); // NOI18N
		1400	// add comment only if there is no definition
		1401	if (pElem.getChildNodes().getLength() == 0) {
		1402	pElem.appendChild(doc.createComment(" " + NbBundle.getMessage(JavaActions.class,
		1403	"COMMENT_set_runtime_cp") + " "));
		1404	}
		1405	targetElem.appendChild(pElem);
		1406
		1407	Element cpElem = doc.createElement("classpath"); // NOI18N
		1408	cpElem.setAttribute("refid", "cp"); // NOI18N
		1409
		1410	Element javaElem = doc.createElement("java"); // NOI18N
		1411	javaElem.setAttribute("classname", "${" + propName + "}"); // NOI18N
		1412
		1413	cpElem = doc.createElement("classpath"); // NOI18N
		1414	cpElem.setAttribute("refid", "cp"); // NOI18N
		1415	javaElem.appendChild(cpElem);
		1416	addProfileInit(doc, doc.getDocumentElement());
		1417	addProfileVMArgs(javaElem, doc);
		1418
		1419	targetElem.appendChild(javaElem);
		1420	return targetElem;
		1421	}
1200		1422
1201	private AntLocation handleInitials(Document doc, Lookup context) {	1423	private AntLocation handleInitials(Document doc, Lookup context) {
1202	ensurePropertiesCopied(doc.getDocumentElement());	1424	ensurePropertiesCopied(doc.getDocumentElement());




            Arrays.asList(new String[] {
                ActionProvider.COMMAND_COMPILE_SINGLE,
                ActionProvider.COMMAND_DEBUG,
                ActionProvider.COMMAND_PROFILE,
                ActionProvider.COMMAND_RUN_SINGLE,
                ActionProvider.COMMAND_DEBUG_SINGLE,
                ActionProvider.COMMAND_PROFILE_SINGLE
            }),
            Arrays.asList(ja.getSupportedActions()));
        /* Not really necessary; once there is a binding, the main ant/freeform Actions will mask this anyway:

            "</project>\n";
        assertEquals(expectedXml, xmlToString(doc.getDocumentElement()));
    }
    
    public void testCreateProfileTargetFromScratch() throws Exception {
        Document doc = XMLUtil.createDocument("project", null, null, null);
        Element genTarget = ja.createProfileTargetFromScratch("profile", doc);
        doc.getDocumentElement().appendChild(genTarget);
        String expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
            "<project>\n" +
            "    <target name=\"-profile-check\">\n" +
            "        <startprofiler freeform=\"true\"/>\n" +
            "    </target>\n" +
            "    <target depends=\"-profile-check,dist\" if=\"profiler.configured\" name=\"profile\">\n" +
            "        <path id=\"cp\">\n" +
            "            <!---->\n" +
            "        </path>\n" +
            "        <!---->\n" +
            "        <java classname=\"some.main.Class\" fork=\"true\">\n" +
            "            <classpath refid=\"cp\"/>\n" +
            "            <jvmarg line=\"${agent.jvmargs}\"/>\n" +
            "        </java>\n" +
            "    </target>\n" +
            "</project>\n";
        assertEquals(expectedXml, xmlToString(doc.getDocumentElement()));
    }
    
    public void testCreateProfileTargetFromTemplate() throws Exception {
        Document doc = XMLUtil.createDocument("project", null, null, null);
        Document origDoc = XMLUtil.createDocument("target", null, null, null);
        Element origTarget = origDoc.getDocumentElement();
        origTarget.setAttribute("name", "ignored");
        origTarget.setAttribute("depends", "compile");
        origTarget.appendChild(origDoc.createElement("task1"));
        Element task = origDoc.createElement("java");
        // XXX also test nested <classpath>:
        task.setAttribute("classpath", "${cp}");
        task.appendChild(origDoc.createElement("stuff"));
        origTarget.appendChild(task);
        origTarget.appendChild(origDoc.createElement("task2"));
        Element genTarget = ja.createProfileTargetFromTemplate("profile", origTarget, task, doc);
        doc.getDocumentElement().appendChild(genTarget);
        String expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
            "<project>\n" +
            "    <target name=\"-profile-check\">\n" +
            "        <startprofiler freeform=\"true\"/>\n" +
            "    </target>\n" +
            "    <target depends=\"-profile-check,dist\" if=\"profiler.configured\" name=\"profile\">\n" +
            "        <task1/>\n" +
            "        <java classpath=\"${cp}\" fork=\"true\">\n" +
            "            <stuff/>\n" +
            "            <jvmarg line=\"${agent.jvmargs}\"/>\n" +
            "        </java>\n" +
            "        <task2/>\n" +
            "    </target>\n" +
            "</project>\n";
        assertEquals(expectedXml, xmlToString(doc.getDocumentElement()));
    }

    public void testCreateRunSingleTargetElem() throws Exception {
        Document doc = XMLUtil.createDocument("project", null, null, null);

Lines 80-89 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java (-1 / +12 lines)
80	COMMAND_RUN_SINGLE,	80	COMMAND_RUN_SINGLE,
81	COMMAND_DEBUG,	81	COMMAND_DEBUG,
82	COMMAND_DEBUG_SINGLE,	82	COMMAND_DEBUG_SINGLE,
		83	COMMAND_PROFILE,
		84	COMMAND_PROFILE_SINGLE,
83	JavaProjectConstants.COMMAND_JAVADOC,	85	JavaProjectConstants.COMMAND_JAVADOC,
84	COMMAND_TEST,	86	COMMAND_TEST,
85	COMMAND_TEST_SINGLE,	87	COMMAND_TEST_SINGLE,
86	COMMAND_DEBUG_TEST_SINGLE,	88	COMMAND_DEBUG_TEST_SINGLE,
		89	COMMAND_PROFILE_TEST_SINGLE,
87	SingleMethod.COMMAND_RUN_SINGLE_METHOD,	90	SingleMethod.COMMAND_RUN_SINGLE_METHOD,
88	SingleMethod.COMMAND_DEBUG_SINGLE_METHOD,	91	SingleMethod.COMMAND_DEBUG_SINGLE_METHOD,
89	JavaProjectConstants.COMMAND_DEBUG_FIX,	92	JavaProjectConstants.COMMAND_DEBUG_FIX,
Lines 103-112 Link Here
103	COMMAND_RUN_SINGLE,	106	COMMAND_RUN_SINGLE,
104	COMMAND_DEBUG,	107	COMMAND_DEBUG,
105	COMMAND_DEBUG_SINGLE,	108	COMMAND_DEBUG_SINGLE,
		109	COMMAND_PROFILE,
		110	COMMAND_PROFILE_SINGLE,
106	JavaProjectConstants.COMMAND_JAVADOC,	111	JavaProjectConstants.COMMAND_JAVADOC,
107	COMMAND_TEST,	112	COMMAND_TEST,
108	COMMAND_TEST_SINGLE,	113	COMMAND_TEST_SINGLE,
109	COMMAND_DEBUG_TEST_SINGLE,	114	COMMAND_DEBUG_TEST_SINGLE,
		115	COMMAND_PROFILE_TEST_SINGLE,
110	SingleMethod.COMMAND_RUN_SINGLE_METHOD,	116	SingleMethod.COMMAND_RUN_SINGLE_METHOD,
111	SingleMethod.COMMAND_DEBUG_SINGLE_METHOD,	117	SingleMethod.COMMAND_DEBUG_SINGLE_METHOD,
112	JavaProjectConstants.COMMAND_DEBUG_FIX,	118	JavaProjectConstants.COMMAND_DEBUG_FIX,
Lines 139-148 Link Here
139	commands.put(COMMAND_RUN_SINGLE, new String[] {"run-single"}); // NOI18N	145	commands.put(COMMAND_RUN_SINGLE, new String[] {"run-single"}); // NOI18N
140	commands.put(COMMAND_DEBUG, new String[] {"debug"}); // NOI18N	146	commands.put(COMMAND_DEBUG, new String[] {"debug"}); // NOI18N
141	commands.put(COMMAND_DEBUG_SINGLE, new String[] {"debug-single"}); // NOI18N	147	commands.put(COMMAND_DEBUG_SINGLE, new String[] {"debug-single"}); // NOI18N
		148	commands.put(COMMAND_PROFILE, new String[] {"profile"}); // NOI18N
		149	commands.put(COMMAND_PROFILE_SINGLE, new String[] {"profile-single"}); // NOI18N
142	commands.put(JavaProjectConstants.COMMAND_JAVADOC, new String[] {"javadoc"}); // NOI18N	150	commands.put(JavaProjectConstants.COMMAND_JAVADOC, new String[] {"javadoc"}); // NOI18N
143	commands.put(COMMAND_TEST, new String[] {"test"}); // NOI18N	151	commands.put(COMMAND_TEST, new String[] {"test"}); // NOI18N
144	commands.put(COMMAND_TEST_SINGLE, new String[] {"test-single"}); // NOI18N	152	commands.put(COMMAND_TEST_SINGLE, new String[] {"test-single"}); // NOI18N
145	commands.put(COMMAND_DEBUG_TEST_SINGLE, new String[] {"debug-test"}); // NOI18N	153	commands.put(COMMAND_DEBUG_TEST_SINGLE, new String[] {"debug-test"}); // NOI18N
		154	commands.put(COMMAND_PROFILE_TEST_SINGLE, new String[]{"profile-test"}); // NOI18N
146	commands.put(JavaProjectConstants.COMMAND_DEBUG_FIX, new String[] {"debug-fix"}); // NOI18N	155	commands.put(JavaProjectConstants.COMMAND_DEBUG_FIX, new String[] {"debug-fix"}); // NOI18N
147	commands.put(COMMAND_DEBUG_STEP_INTO, new String[] {"debug-stepinto"}); // NOI18N	156	commands.put(COMMAND_DEBUG_STEP_INTO, new String[] {"debug-stepinto"}); // NOI18N
148		157
Lines 151-157 Link Here
151	COMMAND_RUN_SINGLE,	160	COMMAND_RUN_SINGLE,
152	COMMAND_DEBUG,	161	COMMAND_DEBUG,
153	COMMAND_DEBUG_SINGLE,	162	COMMAND_DEBUG_SINGLE,
154	COMMAND_DEBUG_STEP_INTO	163	COMMAND_DEBUG_STEP_INTO,
		164	COMMAND_PROFILE,
		165	COMMAND_PROFILE_SINGLE
155	));	166	));
156		167
157	this.needJavaModelActions = new HashSet<String>(Arrays.asList(	168	this.needJavaModelActions = new HashSet<String>(Arrays.asList(




                    </sequential>
                </macrodef>
            </target>
            
            <xsl:comment>
                pre NB7.2 profiling section; consider it deprecated
            </xsl:comment>
            <target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>

            <target name="-profile-pre-init">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
                <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
                <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
            </target>

            <target name="-profile-post-init">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
                <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
                <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
            </target>

            <target name="-profile-init-macrodef-profile">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
                <macrodef>
                  <xsl:attribute name="name">resolve</xsl:attribute>
                  <attribute>


            <target name="-profile-init-check">
                <xsl:attribute name="depends">-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile</xsl:attribute>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
                <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
                <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
            </target>
            <xsl:comment>
                end of pre NB7.2 profiling section
            </xsl:comment>

            <target name="-init-macrodef-nbjpda" depends="-init-debug-args">
                <macrodef>

                        <xsl:attribute name="name">classpath</xsl:attribute>
                        <xsl:attribute name="default">${run.classpath}</xsl:attribute>
                    </attribute>
                    <attribute>
                        <xsl:attribute name="name">jvm</xsl:attribute>
                        <xsl:attribute name="default">jvm</xsl:attribute>
                    </attribute>
                    <element>
                        <xsl:attribute name="name">customize</xsl:attribute>
                        <xsl:attribute name="optional">true</xsl:attribute>

                PROFILING SECTION
                =================
            </xsl:comment>
            <xsl:comment>
                pre NB7.2 profiler integration
            </xsl:comment>
            <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
                <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
                <nbprofiledirect>
                    <classpath>
                        <path path="${{run.classpath}}"/>

                </nbprofiledirect>
                <profile/>
            </target>
            <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
            <target name="profile-single">
                <xsl:attribute name="if">netbeans.home</xsl:attribute>
                <xsl:attribute name="depends">profile-init,compile-single</xsl:attribute>
                <xsl:attribute name="description">Profile a selected class in the IDE.</xsl:attribute>
                <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
                <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
                <nbprofiledirect>
                    <classpath>
                        <path path="${{run.classpath}}"/>
                    </classpath>
                </nbprofiledirect>
                <profile classname="${{profile.class}}"/>
            </target>
            <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
                <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
                =========================
                APPLET PROFILING  SECTION
                =========================
            </xsl:comment>

            <target name="profile-applet">
                <xsl:attribute name="if">netbeans.home</xsl:attribute>
                <xsl:attribute name="depends">profile-init,compile-single</xsl:attribute>
                <nbprofiledirect>
                    <classpath>
                        <path path="${{run.classpath}}"/>
                    </classpath>
                </nbprofiledirect>

                <profile classname="sun.applet.AppletViewer">
                    <customize>
                        <arg value="${{applet.url}}"/>
                    </customize>
                </profile>
            </target>
            <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
                <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
                <nbprofiledirect>
                    <classpath>
                        <path path="${{run.test.classpath}}"/>
                    </classpath>
                </nbprofiledirect>
                <junit dir="${{profiler.info.dir}}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${{profiler.info.jvm}}" showoutput="true">
                    <env key="${{profiler.info.pathvar}}" path="${{profiler.info.agentpath}}:${{profiler.current.path}}"/>
                    <jvmarg value="${{profiler.info.jvmargs.agent}}"/>
                    <jvmarg line="${{profiler.info.jvmargs}}"/>
                    <test name="${{profile.class}}"/>
                    <classpath>
                        <path path="${{run.test.classpath}}"/>
                    </classpath>
                    <syspropertyset>
                        <propertyref prefix="test-sys-prop."/>
                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
                    </syspropertyset>
                    <formatter type="brief" usefile="false"/>
                    <formatter type="xml"/>
                </junit>
            </target>
            <xsl:comment>
                end of pre NB72 profiling section
                TESTS PROFILING  SECTION
                =========================
            </xsl:comment>
            
            <target name="-profile-check" if="netbeans.home">
                <condition property="profiler.configured">
                    <or>
                        <contains string="${{run.jvmargs.ide}}" substring="-agentpath:" casesensitive="false"/>
                        <contains string="${{run.jvmargs.ide}}" substring="-javaagent:" casesensitive="false"/>
                    </or>
                </condition>
            </target>
            
            <target name="profile" depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" unless="profiler.info.jvmargs.agent">
                <startprofiler/>
                <antcall target="run"/>
                  <jvmarg line="${{profiler.info.jvmargs}}"/>
                  <test name="${{profile.class}}"/>
                  <classpath>
                      <path path="${{run.test.classpath}}"/>
                  </classpath>
                  <syspropertyset>
                      <propertyref prefix="test-sys-prop."/>
                      <mapper type="glob" from="test-sys-prop.*" to="*"/>
                  </syspropertyset>
                  <formatter type="brief" usefile="false"/>
                  <formatter type="xml"/>
              </junit>
            </target>

            <target name="profile-single" depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" unless="profiler.info.jvmargs.agent">
                <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
                <startprofiler/>
                <antcall target="run-single"/>
            </target>

            <target name="profile-test-single" depends="-profile-test-single-pre72" description="Profile a selected test in the IDE."/>

            <target name="profile-test" depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" unless="profiler.info.jvmargs">
                <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
                <startprofiler/>
                <antcall target="test-single"/>
            </target>

            <target name="profile-test-with-main" depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured">
                <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
                <startprofiler/>
                <antcal target="run-test-with-main"/>
            </target>
            
            <target name="profile-applet" depends="-profile-check,-profile-applet-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent">
                <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
                <startprofiler/>
                <antcall target="run-applet"/>
            </target>
            
            <xsl:comment>
                ===============
                JAVADOC SECTION

Lines 108-117 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml (-4 lines)
108	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>	108	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>
109	<attr name="position" intvalue="900"/>	109	<attr name="position" intvalue="900"/>
110	</file>	110	</file>
111	<file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.shadow">
112	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.instance"/>
113	<attr name="position" intvalue="1000"/>
114	</file>
115	<file name="org-netbeans-modules-project-ui-TestProject.shadow">	111	<file name="org-netbeans-modules-project-ui-TestProject.shadow">
116	<attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestProject.instance"/>	112	<attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestProject.instance"/>
117	<attr name="position" intvalue="1100"/>	113	<attr name="position" intvalue="1100"/>

Lines 296-301 Link Here

(-)a/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/J2SEActionProviderTest.java (+83 lines)
296	assertEquals("There must be two target parameters", 2, p.keySet().size());	296	assertEquals("There must be two target parameters", 2, p.keySet().size());
297	assertEquals("There must be be target parameter", "foo.BarTest", p.getProperty("test.class"));	297	assertEquals("There must be be target parameter", "foo.BarTest", p.getProperty("test.class"));
298	assertEquals("There must be be target parameter", "foo/BarTest.java", p.getProperty("javac.includes"));	298	assertEquals("There must be be target parameter", "foo/BarTest.java", p.getProperty("javac.includes"));
		299
		300	// test COMMAND_PROFILE_TEST_SINGLE
		301
		302	p = new Properties();
		303	context = Lookups.fixed(someSource1);
		304	targets = actionProvider.getTargetNames(ActionProvider.COMMAND_PROFILE_TEST_SINGLE, context, p);
		305	assertNotNull("Must found some targets for COMMAND_PROFILE_TEST_SINGLE", targets);
		306	assertEquals("There must be one target for COMMAND_PROFILE_TEST_SINGLE", 1, targets.length);
		307	assertEquals("Unexpected target name", "profile-test", targets[0]);
		308	assertEquals("There must be two target parameters", 2, p.keySet().size());
		309	assertEquals("There must be be target parameter", "foo/BarTest.java", p.getProperty("javac.includes"));
		310	assertEquals("There must be be target parameter", "foo/BarTest.java", p.getProperty("test.includes"));
299		311
300	// test COMMAND_DEBUG_FIX	312	// test COMMAND_DEBUG_FIX
301	actionProvider.unitTestingSupport_fixClasses = "foo/Bar";	313	actionProvider.unitTestingSupport_fixClasses = "foo/Bar";
Lines 422-427 Link Here
422	assertEquals("There must be two target parameters", 2, p.keySet().size());	434	assertEquals("There must be two target parameters", 2, p.keySet().size());
423	assertEquals("There must be be target parameter", "foo.BarTest", p.getProperty("debug.class"));	435	assertEquals("There must be be target parameter", "foo.BarTest", p.getProperty("debug.class"));
424	assertEquals("There must be be target parameter", "foo/BarTest.java", p.getProperty("javac.includes"));	436	assertEquals("There must be be target parameter", "foo/BarTest.java", p.getProperty("javac.includes"));
		437
		438	// test COMMAND_PROFILE_SINGLE
		439
		440	p = new Properties();
		441	context = Lookups.fixed(someSource2);
		442	MainClassChooser.unitTestingSupport_hasMainMethodResult = Boolean.TRUE;
		443	try {
		444	targets = actionProvider.getTargetNames(ActionProvider.COMMAND_PROFILE_SINGLE, context, p);
		445	} finally {
		446	MainClassChooser.unitTestingSupport_hasMainMethodResult = null;
		447	}
		448	assertNotNull("Must found some targets for COMMAND_PROFILE_SINGLE", targets);
		449	assertEquals("There must be one target for COMMAND_PROFILE_SINGLE", 1, targets.length);
		450	assertEquals("Unexpected target name", "profile-single", targets[0]);
		451	assertEquals("There must be one target parameter", 2, p.keySet().size());
		452	assertEquals("There must be be target parameter", "foo/Main.java", p.getProperty("javac.includes"));
		453	assertEquals("There must be be target parameter", "foo.Main", p.getProperty("run.class"));
		454	p = new Properties();
		455	context = Lookups.fixed(someSource2);
		456	MainClassChooser.unitTestingSupport_hasMainMethodResult = Boolean.FALSE;
		457	AppletSupport.unitTestingSupport_isApplet = Boolean.TRUE;
		458	try {
		459	targets = actionProvider.getTargetNames(ActionProvider.COMMAND_PROFILE_SINGLE, context, p);
		460	} finally {
		461	MainClassChooser.unitTestingSupport_hasMainMethodResult = null;
		462	AppletSupport.unitTestingSupport_isApplet = null;
		463	}
		464	assertNotNull("Must found some targets for COMMAND_PROFILE_SINGLE", targets);
		465	assertEquals("There must be one target for COMMAND_PROFILE_SINGLE", 1, targets.length);
		466	assertEquals("Unexpected target name", "profile-applet", targets[0]);
		467	assertEquals("There must be one target parameter", 3, p.keySet().size());
		468	assertEquals("There must be be target parameter", "foo/Main.java", p.getProperty("javac.includes"));
		469	appletHtml = build.getFileObject("Main", "html");
		470	assertNotNull("Applet HTML page must be generated", appletHtml);
		471	appletUrl = URLMapper.findURL(appletHtml, URLMapper.EXTERNAL);
		472	assertEquals("There must be be target parameter", appletUrl.toExternalForm(), p.getProperty("applet.url"));
		473	p = new Properties();
		474	context = Lookups.fixed(someTest1);
		475	MainClassChooser.unitTestingSupport_hasMainMethodResult = Boolean.TRUE;
		476	AppletSupport.unitTestingSupport_isApplet = Boolean.TRUE;
		477	try {
		478	targets = actionProvider.getTargetNames(ActionProvider.COMMAND_PROFILE_SINGLE, context, p);
		479	} finally {
		480	MainClassChooser.unitTestingSupport_hasMainMethodResult = null;
		481	AppletSupport.unitTestingSupport_isApplet = null;
		482	}
		483	assertNotNull("Must found some targets for COMMAND_PROFILE_SINGLE", targets);
		484	assertEquals("There must be one target for COMMAND_PROFILE_SINGLE", 1, targets.length);
		485	assertEquals("Unexpected target name", "profile-test-with-main", targets[0]);
		486	assertEquals("There must be two target parameters", 2, p.keySet().size());
		487	assertEquals("There must be be target parameter", "foo.BarTest", p.getProperty("run.class"));
		488	assertEquals("There must be be target parameter", "foo/BarTest.java", p.getProperty("javac.includes"));
425		489
426	// test COMMAND_RUN	490	// test COMMAND_RUN
427		491
Lines 478-483 Link Here
478	//See issue #61244: Main class setting not saved for J2SE Project during IDE session	542	//See issue #61244: Main class setting not saved for J2SE Project during IDE session
479	assertEquals("There must be one target parameter", 1, p.keySet().size());	543	assertEquals("There must be one target parameter", 1, p.keySet().size());
480	assertEquals("There must be be target parameter", "foo.Main", p.getProperty("debug.class"));	544	assertEquals("There must be be target parameter", "foo.Main", p.getProperty("debug.class"));
		545
		546	// test COMMAND_PROFILE
		547
		548	p = new Properties();
		549	context = Lookup.EMPTY;
		550	MainClassChooser.unitTestingSupport_hasMainMethodResult = Boolean.TRUE;
		551	try {
		552	targets = actionProvider.getTargetNames(ActionProvider.COMMAND_PROFILE, context, p);
		553	} finally {
		554	MainClassChooser.unitTestingSupport_hasMainMethodResult = null;
		555	}
		556	assertNotNull("Must found some targets for COMMAND_PROFILE", targets);
		557	assertEquals("There must be one target for COMMAND_PROFILE", 1, targets.length);
		558	assertEquals("Unexpected target name", "profile", targets[0]);
		559	//The project is saved after the main.class property was added into the project's properties,
		560	//it is no more needed to pass it in the properties.
		561	//See issue #61244: Main class setting not saved for J2SE Project during IDE session
		562	assertEquals("There must be one target parameter", 1, p.keySet().size());
		563	assertEquals("There must be be target parameter", "foo.Main", p.getProperty("run.class"));
481	}	564	}
482		565
483	public void testGetTargetNamesFromConfig() throws Exception {	566	public void testGetTargetNamesFromConfig() throws Exception {

Lines 108-113 Link Here

(-)a/java.project/src/org/netbeans/api/java/project/runner/JavaRunner.java (+6 lines)
108	*/	108	*/
109	public static final String QUICK_DEBUG = "debug";	109	public static final String QUICK_DEBUG = "debug";
110		110
		111	public static final String QUICK_PROFILE = "profile";
		112
111	/**	113	/**
112	* <p>"Test" run the given test. Classfiles produced by the Java infrastructure will be	114	* <p>"Test" run the given test. Classfiles produced by the Java infrastructure will be
113	* executed.</p>	115	* executed.</p>
Lines 134-139 Link Here
134	*/	136	*/
135	public static final String QUICK_TEST_DEBUG = "junit-debug";	137	public static final String QUICK_TEST_DEBUG = "junit-debug";
136		138
		139	public static final String QUICK_TEST_PROFILE = "junit-profile";
		140
137	/** <p>"Test" run the given applet. Classfiles produced by the Java infrastructure will be	141	/** <p>"Test" run the given applet. Classfiles produced by the Java infrastructure will be
138	* executed.</p>	142	* executed.</p>
139	*	143	*
Lines 156-161 Link Here
156	*/	160	*/
157	public static final String QUICK_DEBUG_APPLET = "debug-applet";	161	public static final String QUICK_DEBUG_APPLET = "debug-applet";
158		162
		163	public static final String QUICK_PROFILE_APPLET = "profile-applet";
		164
159	/** Clean classfiles produced by the Java infrastructure.	165	/** Clean classfiles produced by the Java infrastructure.
160	*	166	*
161	* @since 1.22	167	* @since 1.22




Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-->
<project name="{0} (profile-test)" default="profile-test" basedir=".">
    <target name="-profile-check" if="netbeans.home">
        <condition property="profiler.configured">
            <or>
                <contains string="${run.jvmargs.ide}" substring="-agentpath:" casesensitive="false"/>
                <contains string="${run.jvmargs.ide}" substring="-javaagent:" casesensitive="false"/>
            </or>
        </condition>
    </target>
    
    <target name="-check-run-test-single-method-supported" if="methodname">
        <available property="run.test.single.method.supported"
                   resource="org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.class"/>
        <fail unless="run.test.single.method.supported">Execution of a single test method is not supported by this version of Ant.</fail>
    </target>
    <target name="-prepare-execution">
        <property name="version-output" value="java version &quot;${ant.java.version}"/>
        <condition property="have-jdk-older-than-1.4">
            <or>
                <contains string="${version-output}" substring="java version &quot;1.0"/>
                <contains string="${version-output}" substring="java version &quot;1.1"/>
                <contains string="${version-output}" substring="java version &quot;1.2"/>
                <contains string="${version-output}" substring="java version &quot;1.3"/>
            </or>
        </condition>
        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
            <istrue value="${have-jdk-older-than-1.4}"/>
        </condition>
        <condition property="debug-transport-by-os" value="dt_shmem" else="dt_socket">
            <os family="windows"/>
        </condition>
        <condition property="debug-transport" value="${debug.transport}" else="${debug-transport-by-os}">
            <isset property="debug.transport"/>
        </condition>
    </target>
    <target name="-prepare-execution" depends="-init-debug-args">
        <property name="test.result.dir" location="${java.io.tmpdir}"/>
        <property name="test.result.file"
                  location="${test.result.dir}/TEST-${classname}.xml"/>
        <property  name="tmp.dir" value="${basedir}"/>
        <macrodef name="junit-template">
            <element name="test-spec" implicit="yes"/>
            <sequential>
                <translate-classpath classpath="${classpath}" targetProperty="classpath-translated" />
                <nbjpdastart addressproperty="jpda.address" name="${classname}" stopclassname="" transport="${debug-transport}" listeningcp="${classpath}">
                    <classpath>
                        <path path="${classpath-translated}"/>
                    </classpath>
                    <bootclasspath>
                        <path path="${platform.bootcp}"/>
                    </bootclasspath>
                </nbjpdastart>
                <property name="run.jvmargs" value="" />
                <property name="work.dir" value="${basedir}"/>

                <startprofiler/>
                <junit showoutput="true" fork="true" dir="${work.dir}" jvm="${platform.java}" tempdir="${tmp.dir}">
                    <test-spec/>
                    <classpath path="${classpath-translated}" />
                    <jvmarg line="${debug-args-line}"/>
                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
                    <jvmarg value="-ea"/>
                    <jvmarg line="${run.jvmargs}"/>
                    <jvmarg line="${run.jvmargs.ide}"/>
                    <formatter type="brief" usefile="false"/>
                    <formatter type="xml" />
                    <syspropertyset>

        </macrodef>
        <translate-classpath classpath="${classpath}" targetProperty="classpath-translated"/>
    </target>
    <target name="-test-class" depends="-prepare-execution" unless="methodname">
        <junit-template>
            <test name="${classname}" todir="${test.result.dir}"/>
        </junit-template>
    </target>
    <target name="-test-method" depends="-check-run-test-single-method-supported,-prepare-execution" if="methodname">
        <junit-template>
            <test name="${classname}" methods="${methodname}"
                  todir="${test.result.dir}"/>
        </junit-template>
    </target>
    <target name="profile-test" depends="-profile-check,-test-class,-test-method" if="profiler.configured">
        <!-- This target is intended to be used in conjunction with the
        org.apache.tools.ant.module.spi.AntLogger. Note, the next task
        deletes just created test report. -->
        <delete file="${test.result.file}" deleteonexit="true" />
    </target>

</project>




Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-->
<project name="{0} (profile-applet)" default="profile" basedir=".">
    <target name="-profile-check" if="netbeans.home">
        <condition property="profiler.configured">
        <condition property="have-jdk-older-than-1.4">
            <or>
                <contains string="${run.jvmargs.ide}" substring="-agentpath:" casesensitive="false"/>
                <contains string="${run.jvmargs.ide}" substring="-javaagent:" casesensitive="false"/>
                <contains string="${version-output}" substring="java version &quot;1.2"/>
                <contains string="${version-output}" substring="java version &quot;1.3"/>
            </or>
        </condition>
        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
            <istrue value="${have-jdk-older-than-1.4}"/>
        </condition>
        <condition property="debug-transport-by-os" value="dt_shmem" else="dt_socket">
            <os family="windows"/>
        </condition>
        <condition property="debug-transport" value="${debug.transport}" else="${debug-transport-by-os}">
            <isset property="debug.transport"/>
        </condition>
    </target>
    
    <target name="profile" depends="-profile-check" if="profiler.configured">
        <translate-classpath classpath="${classpath}" targetProperty="classpath-translated" />
        <property name="run.jvmargs" value="" />
        <property name="work.dir" value="${basedir}"/>

        <startprofiler/>
                <path path="${classpath-translated}"/>
            </classpath>
            <bootclasspath>
                <path path="${platform.bootcp}"/>
            </bootclasspath>
        </nbjpdastart>
        <java classpath="${classpath-translated}" classname="sun.applet.AppletViewer" dir="${work.dir}" jvm="${platform.java}" fork="true">
            <jvmarg line="${debug-args-line}"/>
            <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
            <jvmarg line="${run.jvmargs}" />
            <jvmarg line="${run.jvmargs.ide}" />
            <arg value="${applet.url}"/>
            <syspropertyset>
                <propertyref prefix="run-sys-prop."/>




Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-->
<project name="{0} (profile)" default="profile" basedir=".">
    <target name="-profile-check" if="netbeans.home">
        <condition property="profiler.configured">
        <condition property="have-jdk-older-than-1.4">
            <or>
                <contains string="${run.jvmargs.ide}" substring="-agentpath:" casesensitive="false"/>
                <contains string="${run.jvmargs.ide}" substring="-javaagent:" casesensitive="false"/>
                <contains string="${version-output}" substring="java version &quot;1.2"/>
                <contains string="${version-output}" substring="java version &quot;1.3"/>
            </or>
        </condition>
        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
            <istrue value="${have-jdk-older-than-1.4}"/>
        </condition>
        <condition property="debug-transport-by-os" value="dt_shmem" else="dt_socket">
            <os family="windows"/>
        </condition>
        <condition property="debug-transport" value="${debug.transport}" else="${debug-transport-by-os}">
            <isset property="debug.transport"/>
        </condition>
    </target>
    <target name="profile" depends="-profile-check" if="profiler.configured">
    <target name="debug" depends="-init-debug-args">
        <translate-classpath classpath="${classpath}" targetProperty="classpath-translated" />
        <property name="run.jvmargs" value="" />
        <property name="run.jvmargs.ide" value="" />
        <property name="work.dir" value="${basedir}"/>
        <property name="application.args" value="" />

        <startprofiler/>
            <classpath>
                <path path="${classpath-translated}"/>
            </classpath>
            <bootclasspath>
                <path path="${platform.bootcp}"/>
            </bootclasspath>
        </nbjpdastart>
        <java classpath="${classpath-translated}" classname="${classname}" dir="${work.dir}" jvm="${platform.java}" fork="true">
            <jvmarg line="${debug-args-line}"/>
            <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
            <jvmarg value="-Dfile.encoding=${encoding}"/>
            <redirector inputencoding="${encoding}" outputencoding="${encoding}" errorencoding="${encoding}"/>
            <jvmarg line="${run.jvmargs}" />
            <jvmarg line="${run.jvmargs.ide}"/>
            <arg line="${application.args}" />
            <syspropertyset>
                <propertyref prefix="run-sys-prop."/>

Lines 70-76 Link Here

(-)a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NetBeansStartupArgs.java (-1 / +1 lines)
70	mode = StartupExtender.StartMode.NORMAL;	70	mode = StartupExtender.StartMode.NORMAL;
71	} else if (ActionProvider.COMMAND_DEBUG.equals(actionName)) {	71	} else if (ActionProvider.COMMAND_DEBUG.equals(actionName)) {
72	mode = StartupExtender.StartMode.DEBUG;	72	mode = StartupExtender.StartMode.DEBUG;
73	} else if ("profile".equals(actionName)) {	73	} else if (ActionProvider.COMMAND_PROFILE.equals(actionName)) {
74	mode = StartupExtender.StartMode.PROFILE;	74	mode = StartupExtender.StartMode.PROFILE;
75	} else {	75	} else {
76	return true;	76	return true;

Lines 121-126 Link Here

(-)a/maven.profiler/nbproject/project.xml (+24 lines)
121	</run-dependency>	121	</run-dependency>
122	</dependency>	122	</dependency>
123	<dependency>	123	<dependency>
		124	<code-name-base>org.openide.execution</code-name-base>
		125	<build-prerequisite/>
		126	<compile-dependency/>
		127	<run-dependency>
		128	<specification-version>1.25</specification-version>
		129	</run-dependency>
		130	</dependency>
		131	<dependency>
124	<code-name-base>org.openide.filesystems</code-name-base>	132	<code-name-base>org.openide.filesystems</code-name-base>
125	<build-prerequisite/>	133	<build-prerequisite/>
126	<compile-dependency/>	134	<compile-dependency/>
Lines 129-134 Link Here
129	</run-dependency>	137	</run-dependency>
130	</dependency>	138	</dependency>
131	<dependency>	139	<dependency>
		140	<code-name-base>org.openide.loaders</code-name-base>
		141	<build-prerequisite/>
		142	<compile-dependency/>
		143	<run-dependency>
		144	<specification-version>7.33</specification-version>
		145	</run-dependency>
		146	</dependency>
		147	<dependency>
		148	<code-name-base>org.openide.nodes</code-name-base>
		149	<build-prerequisite/>
		150	<compile-dependency/>
		151	<run-dependency>
		152	<specification-version>7.27</specification-version>
		153	</run-dependency>
		154	</dependency>
		155	<dependency>
132	<code-name-base>org.openide.util</code-name-base>	156	<code-name-base>org.openide.util</code-name-base>
133	<build-prerequisite/>	157	<build-prerequisite/>
134	<compile-dependency/>	158	<compile-dependency/>




            <goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
        </goals>
        <properties>
            <exec.args>-classpath %classpath ${packageClassName}</exec.args>
            <exec.executable>java</exec.executable>
            <profiler.action>profile</profiler.action>
        </properties>
    </action>


            <goal>nbm:run-ide</goal>
        </goals>
        <properties>
            <netbeans.run.params.ide/>
            <profiler.action>profile</profiler.action>
        </properties>
    </action>
    <action>

            <goal>nbm:run-platform</goal>
        </goals>
        <properties>
            <netbeans.run.params.ide/>
            <profiler.action>profile</profiler.action>
        </properties>
    </action>

    <action>
        <actionName>profile.single</actionName>
        <packagings>
            <packaging>*</packaging>
        </packagings>
        <goals>
            <goal>process-classes</goal>
            <goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
        </goals>
        <properties>
            <exec.args>-classpath %classpath ${packageClassName}</exec.args>
            <exec.executable>java</exec.executable>
            <exec.classpathScope>${classPathScope}</exec.classpathScope>
            <profiler.action>profile-single</profiler.action>
        </properties>
    </action>

    <action>
        <actionName>profile.single.deploy</actionName>
        <packagings>
            <packaging>war</packaging>
        </packagings>

    </action>

    <action>
        <actionName>profile.test.single</actionName>
        <packagings>
            <packaging>*</packaging>
        </packagings>

            <goal>surefire:test</goal>
        </goals>
        <properties>
            <test>${packageClassName}</test>
            <forkMode>once</forkMode>
            <maven.surefire.debug>${exec.args}</maven.surefire.debug>
            <!-- need to declare exec.args property to engage the StartupExtender infrastructure -->
            <exec.args/>
            -->
            <profiler.action>profile-tests</profiler.action>
        </properties>
    </action>
</actions>




    };
    
    
    public JavaPlatform resolveProjectJavaPlatform() {
        return JavaPlatform.getDefaultPlatform();
    }


    
    @Override
    public boolean startProfilingSession(final FileObject profiledClassFile, final boolean isTest, final Properties properties) {
//        RequestProcessor.getDefault().post(new Runnable() {
//            public void run() { startMaven(getProject().getLookup().lookup(Project.class), profiledClassFile, isTest, properties); }
//        });
        
        return true;
    }
    
//    private void startMaven(Project project, FileObject profiledClassFile, boolean isTest, Properties properties) {
//        ProfilingSettings lastProfilingSettings = new ProfilingSettings();
//        SessionSettings lastSessionSettings = new SessionSettings();
//        Properties lastSessionProperties = new Properties(properties);
//        
//        lastProfilingSettings.load(properties);
//        lastSessionSettings.load(properties);
//        
//        RunCheckerImpl.configureProject(project, lastSessionProperties, lastProfilingSettings, lastSessionSettings);
//
//        NetBeansProfiler.getDefaultNB().setProfiledProject(project, profiledClassFile);
//
//        String packaging = project.getLookup().lookup(NbMavenProject.class).getPackagingType();
//        
//        if (profiledClassFile != null) ProjectUtilities.invokeAction(project, isTest ? "profile-tests": (packaging.equals("war") ? "profile-single.deploy" : "profile-single")); //NOI18N
//        else ProjectUtilities.invokeAction(project, isTest ? "profile-tests" : "profile"); //NOI18N
//    }
    
    
    public MavenProjectProfilingSupportProvider(Project project) {




import org.netbeans.modules.maven.api.NbMavenProject;
import org.netbeans.modules.maven.spi.actions.AbstractMavenActionsProvider;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.ActionProvider;
import org.openide.util.Lookup;

/**


    @Override
    public boolean isActionEnable(String action, Project project, Lookup lookup) {
        if (!(action.equals(ActionProvider.COMMAND_PROFILE) || action.startsWith(ActionProvider.COMMAND_PROFILE_SINGLE) || action.equals(ActionProvider.COMMAND_PROFILE_TEST_SINGLE))) {
            return false;
        }
        NbMavenProject mavenprj = project.getLookup().lookup(NbMavenProject.class);


    @Override
    protected InputStream getActionDefinitionStream() {
        String path = "/org/netbeans/modules/maven/profiler/ActionMappings.xml"; //NOI18N
        InputStream in = getClass().getResourceAsStream(path);
        assert in != null : "no instream for " + path; //NOI18N
        return in;
    }
}




package org.netbeans.modules.maven.profiler;

import java.io.File;
import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.lib.profiler.common.Profiler;
import org.netbeans.lib.profiler.common.ProfilingSettings;
import org.netbeans.lib.profiler.common.SessionSettings;
import org.netbeans.modules.maven.api.execute.ExecutionContext;
import org.netbeans.modules.maven.api.execute.LateBoundPrerequisitesChecker;
import org.netbeans.modules.maven.api.execute.PrerequisitesChecker;
import org.netbeans.modules.maven.api.execute.RunConfig;
import org.netbeans.modules.maven.api.execute.RunUtils;
import org.netbeans.modules.profiler.NetBeansProfiler;
import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher;
import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher.Launcher;
import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher.Session;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.util.Lookup;
import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;
import org.openide.util.lookup.Lookups;

/**
 *
 * @author mkleint
 * @author Jiri Sedlacek
 */
@ProjectServiceProvider(service={LateBoundPrerequisitesChecker.class}, projectType="org-netbeans-modules-maven")
public class RunCheckerImpl implements LateBoundPrerequisitesChecker {
    
    private static final String ACTION_PROFILE = "profile"; // NOI18N
    private static final String ACTION_PROFILE_SINGLE = "profile-single"; // NOI18N
        private static final String ACTION_PROFILE_TESTS = "profile-tests"; // NOI18N

    private static final Logger LOG = Logger.getLogger(RunCheckerImpl.class.getName());
    

    private static final String PROFILER_JDKHOME_OPT = "${profiler.jdkhome.opt}"; // NOI18N
    
    private final Project project;
    private static final Map<Project, Properties> properties = new WeakHashMap();
    private static final Map<Project, ProfilingSettings> profilingSettings = new WeakHashMap();
    private static final Map<Project, SessionSettings> sessionSettings = new WeakHashMap();

    @ProjectServiceProvider(service=ProfilerLauncher.LauncherFactory.class, projectType="org-netbeans-modules-maven")
    final public static class MavenLauncherFactory implements ProfilerLauncher.LauncherFactory {
        @Override
        public Launcher createLauncher(final Session session) {
            return new Launcher() {

                @Override
                public void launch(boolean rerun) {
                    if (rerun) {
                        RunConfig config = (RunConfig)session.getAttribute("mvn-run-checker.config");
                        if (config != null) {
                            RunUtils.executeMaven(config);
                        }
                    } else {
                        Project p = session.getProject();
                        if (p == null) {
                            FileObject f = session.getFile();
                            if (f != null) {
                                p = FileOwnerQuery.getOwner(f);
                            }
                        }
                        if (p != null) {
                            ActionProvider ap = p.getLookup().lookup(ActionProvider.class);
                            if (ap != null) {
                                ap.invokeAction(session.getCommand(), session.getContext());
                            }
                        }
                    }
                }
            };
        }
        
    }
    
    public RunCheckerImpl(Project prj) {
        project = prj;
    }
    
//    static void configureProject(Project project, Properties p, ProfilingSettings ps, SessionSettings ss) {
//        properties.put(project, p);
//        profilingSettings.put(project, ps);
//        sessionSettings.put(project, ss);
//    }
//    
//    private void configureProfiler(RunConfig config, Properties props) {
//        ProfilingSettings lastProfilingSettings = new ProfilingSettings();
//        SessionSettings lastSessionSettings = new SessionSettings();
//        
//        lastProfilingSettings.load(props);
//        lastSessionSettings.load(props);
//        
//        NetBeansProfiler.getDefaultNB().setProfiledProject(config.getProject(), config.getSelectedFileObject());
//    }

//    @Override
//    public boolean checkRunConfig(RunConfig config) {
//        if (ActionProvider.COMMAND_PROFILE.equals(config.getActionName()) ||
//               ActionProvider.COMMAND_PROFILE_TEST_SINGLE.equals(config.getActionName()) ||
//              (config.getActionName() != null && config.getActionName().startsWith(ActionProvider.COMMAND_PROFILE_SINGLE))) {
//            isFirstRun = true;
//        }
//        
//        return true;
//    }
    
    @Override
    public boolean checkRunConfig(final RunConfig config, ExecutionContext context) {
        Map<? extends String,? extends String> configProperties = config.getProperties();
        
        if (ActionProvider.COMMAND_PROFILE.equals(config.getActionName()) ||
               ActionProvider.COMMAND_PROFILE_TEST_SINGLE.equals(config.getActionName()) ||
              (config.getActionName() != null && config.getActionName().startsWith(ActionProvider.COMMAND_PROFILE_SINGLE))) {
            Map<String, String> props = new HashMap<String, String>();
            props.putAll(configProperties);

            ProfilerLauncher.Session session = ProfilerLauncher.getLastSession();
            
            if (session == null) {
                return false;
            Properties sessionProperties = properties.get(project);
            if (sessionProperties == null) return false;
            // Resolve profiling session properties
            for (Object k : configProperties.keySet()) {
                String key = (String)k;
                
                String value = configProperties.get(key);
                if (value.contains(PROFILER_ARGS)) {
                    value = value.replace(PROFILER_ARGS, profilerArgs(sessionProperties, false));
                    config.setProperty(key, value.trim());
                }
                if (value.contains(PROFILER_ARGS_PREFIXED)) {
                    value = value.replace(PROFILER_ARGS_PREFIXED, profilerArgs(sessionProperties, true));
                    config.setProperty(key, value.trim());
                }
                if (value.contains(PROFILER_JAVA)) {
                    String profilerJava = sessionProperties.getProperty("profiler.info.jvm"); // NOI18N
                    value = value.replace(PROFILER_JAVA,
                            (profilerJava != null && new File(profilerJava).isFile()) ? profilerJava : "java"); // NOI18N
                    config.setProperty(key, value.trim());
                }
                if (value.contains(PROFILER_JDKHOME_OPT)) {
                    String opt = "";
                    String profilerJava = sessionProperties.getProperty("profiler.info.jvm"); // NOI18N
                    if (profilerJava != null) {
                        File binJava = new File(profilerJava);
                        if (binJava.isFile() && binJava.getName().matches("java([.]exe)?") && binJava.getParentFile().getName().equals("bin")) {
                            String jdkhome = binJava.getParentFile().getParent();
                            opt = Utilities.escapeParameters(new String[] {"--jdkhome", jdkhome});
                            LOG.log(Level.FINE, "from {0} escaped {1}", new Object[] {jdkhome, opt});
                        }
                    }
                    value = value.replace(PROFILER_JDKHOME_OPT, opt);
                    config.setProperty(key, value.trim());
                }
            }
                       
            Map<String, String> sProps = session.getProperties();
            if (sProps == null) return false;
            
            props.putAll(sProps);
            
            session.setAttribute("mvn-run-checker.config", config);
                        
            final ProfilerLauncher.Session s = session;
            // Attach profiler engine (in separate thread) to profiled process
            RequestProcessor.getDefault().post(new Runnable() {
                public void run() {
                    Profiler.getDefault().connectToStartedApp(s.getProfilingSettings(), s.getSessionSettings());
                    SessionSettings ss = sessionSettings.get(project);
                    Profiler.getDefault().connectToStartedApp(ps, ss);
                }
            });
            
//        } else if (ACTION_PROFILE_SINGLE.equals(actionName)) { // action "profile-single"
//            // profile-single not supported yet, shouldn't get here
//        } else if (ACTION_PROFILE_TESTS.equals(actionName)) {
//            // profile-tests not supported yet, shouldn't get here // action "profile-tests"
        }
        
        return true;
    }

    private String profilerArgs(Map<String, String> sessionProperties, boolean prefixed) {
        List<String> args = new ArrayList<String>();
        String jvmargs = sessionProperties.get("profiler.info.jvmargs");
        for (String arg : Utilities.parseParameters(jvmargs)) {
            args.add(prefixed ? "-J" + arg : arg);
        }
        String agentarg = sessionProperties.get("agent.jvmargs");
        if (Utilities.isWindows()) {
            agentarg = agentarg.replace('\\', '/'); // XXX is this still necessary given quoting?
        }

Lines 128-134 Link Here

(-)a/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java (-3 / +13 lines)
128	COMMAND_DEBUG_SINGLE,	128	COMMAND_DEBUG_SINGLE,
129	COMMAND_DEBUG_TEST_SINGLE,	129	COMMAND_DEBUG_TEST_SINGLE,
130	"debug.fix", //NOI18N	130	"debug.fix", //NOI18N
131		131	COMMAND_PROFILE,
		132	COMMAND_PROFILE_SINGLE,
		133	COMMAND_PROFILE_TEST_SINGLE,
		134
132	//operations	135	//operations
133	COMMAND_DELETE,	136	COMMAND_DELETE,
134	COMMAND_RENAME,	137	COMMAND_RENAME,
Lines 181-187 Link Here
181		184
182	@Messages("run_single_method_disabled=Surefire 2.8+ with JUnit 4 needed to run a single test method without Compile on Save.")	185	@Messages("run_single_method_disabled=Surefire 2.8+ with JUnit 4 needed to run a single test method without Compile on Save.")
183	@Override public void invokeAction(final String action, final Lookup lookup) {	186	@Override public void invokeAction(final String action, final Lookup lookup) {
184	if (action.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) \|\| action.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD)) {	187	if (action.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) \|\|
		188	action.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD)) {
185	if (!runSingleMethodEnabled()) {	189	if (!runSingleMethodEnabled()) {
186	StatusDisplayer.getDefault().setStatusText(run_single_method_disabled());	190	StatusDisplayer.getDefault().setStatusText(run_single_method_disabled());
187	return;	191	return;
Lines 251-256 Link Here
251	@Messages({	255	@Messages({
252	"# {0} - artifactId", "TXT_Run=Run {0}",	256	"# {0} - artifactId", "TXT_Run=Run {0}",
253	"# {0} - artifactId", "TXT_Debug=Debug {0}",	257	"# {0} - artifactId", "TXT_Debug=Debug {0}",
		258	"# {0} - artifactId", "TXT_Profile=Profile {0}",
254	"# {0} - artifactId", "TXT_Test=Test {0}",	259	"# {0} - artifactId", "TXT_Test=Test {0}",
255	"# {0} - artifactId", "TXT_Build=Build {0}"	260	"# {0} - artifactId", "TXT_Build=Build {0}"
256	})	261	})
Lines 267-278 Link Here
267	title = TXT_Run(prj.getMavenProject().getArtifactId());	272	title = TXT_Run(prj.getMavenProject().getArtifactId());
268	} else if (ActionProvider.COMMAND_DEBUG.equals(action)) {	273	} else if (ActionProvider.COMMAND_DEBUG.equals(action)) {
269	title = TXT_Debug(prj.getMavenProject().getArtifactId());	274	title = TXT_Debug(prj.getMavenProject().getArtifactId());
		275	} else if (ActionProvider.COMMAND_PROFILE.equals(action)) {
		276	title = TXT_Profile(prj.getMavenProject().getArtifactId());
270	} else if (ActionProvider.COMMAND_TEST.equals(action)) {	277	} else if (ActionProvider.COMMAND_TEST.equals(action)) {
271	title = TXT_Test(prj.getMavenProject().getArtifactId());	278	title = TXT_Test(prj.getMavenProject().getArtifactId());
272	} else if (action.startsWith(ActionProvider.COMMAND_RUN_SINGLE)) {	279	} else if (action.startsWith(ActionProvider.COMMAND_RUN_SINGLE)) {
273	title = TXT_Run(dobjName);	280	title = TXT_Run(dobjName);
274	} else if (action.startsWith(ActionProvider.COMMAND_DEBUG_SINGLE) \|\| ActionProvider.COMMAND_DEBUG_TEST_SINGLE.equals(action)) {	281	} else if (action.startsWith(ActionProvider.COMMAND_DEBUG_SINGLE) \|\| ActionProvider.COMMAND_DEBUG_TEST_SINGLE.equals(action)) {
275	title = TXT_Debug(dobjName);	282	title = TXT_Debug(dobjName);
		283	} else if (action.startsWith(ActionProvider.COMMAND_PROFILE_SINGLE) \|\| ActionProvider.COMMAND_PROFILE_TEST_SINGLE.equals(action)) {
		284	title = TXT_Profile(dobjName);
276	} else if (ActionProvider.COMMAND_TEST_SINGLE.equals(action)) {	285	} else if (ActionProvider.COMMAND_TEST_SINGLE.equals(action)) {
277	title = TXT_Test(dobjName);	286	title = TXT_Test(dobjName);
278	} else {	287	} else {
Lines 289-295 Link Here
289	COMMAND_MOVE.equals(action)) {	298	COMMAND_MOVE.equals(action)) {
290	return true;	299	return true;
291	}	300	}
292	if (action.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) \|\| action.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD)) {	301	if (action.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) \|\|
		302	action.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD)) {
293	return true;	303	return true;
294	}	304	}
295	//TODO if order is important, use the lookupmerger	305	//TODO if order is important, use the lookupmerger

Lines 122-128 Link Here

(-)a/maven/src/org/netbeans/modules/maven/layer.xml (-1 / +1 lines)
122	<attr name="position" intvalue="1000"/>	122	<attr name="position" intvalue="1000"/>
123	</file>	123	</file>
124	<file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.shadow">	124	<file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.shadow">
125	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.instance"/>	125	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-actions-ProfileProjectPopup.instance"/>
126	<attr name="position" intvalue="1100"/>	126	<attr name="position" intvalue="1100"/>
127	</file>	127	</file>
128	<file name="org-netbeans-modules-project-ui-TestProject.shadow">	128	<file name="org-netbeans-modules-project-ui-TestProject.shadow">

Lines 71-78 Link Here

(-)a/maven/src/org/netbeans/modules/maven/runjar/RunJarStartupArgs.java (-1 / +3 lines)
71	mode = StartupExtender.StartMode.NORMAL;	71	mode = StartupExtender.StartMode.NORMAL;
72	} else if (ActionProvider.COMMAND_DEBUG.equals(actionName) \|\| DEBUG_MAIN.equals(actionName)) {	72	} else if (ActionProvider.COMMAND_DEBUG.equals(actionName) \|\| DEBUG_MAIN.equals(actionName)) {
73	mode = StartupExtender.StartMode.DEBUG;	73	mode = StartupExtender.StartMode.DEBUG;
74	} else if ("profile".equals(actionName)) {	74	} else if (ActionProvider.COMMAND_PROFILE.equals(actionName) \|\| ActionProvider.COMMAND_PROFILE_SINGLE.equals(actionName)) {
75	mode = StartupExtender.StartMode.PROFILE;	75	mode = StartupExtender.StartMode.PROFILE;
		76	} else if (ActionProvider.COMMAND_PROFILE_TEST_SINGLE.equals(actionName)) {
		77	mode = StartupExtender.StartMode.TEST_PROFILE;
76	} else {	78	} else {
77	// XXX could also set argLine for COMMAND_TEST and relatives (StartMode.TEST_*); need not be specific to TYPE_JAR	79	// XXX could also set argLine for COMMAND_TEST and relatives (StartMode.TEST_*); need not be specific to TYPE_JAR
78	return true;	80	return true;




    <property name="debug.server" value="n"/>
    <antcall target="tryme"/>
  </target>

  <target name="-profile-check" if="netbeans.home">
      <condition property="profiler.configured">
          <or>
              <contains string="${run.args.ide}" substring="-agentpath:" casesensitive="false"/>
              <contains string="${run.args.ide}" substring="-javaagent:" casesensitive="false"/>
          </or>
      </condition>
  </target>
  
  <target name="-tryme-profile-pre72" depends="-jdk-presetdef-nbprofiledirect" if="profiler.info.jvmargs.agent" description="Start IDE in profiler (pre72 compatibility mode). May only be called from within IDE.">
    <property name="profiler.roots.path" value="profiler.roots.all" />
    <fileset id="profiler.roots.all" dir="${netbeans.dest.dir}">
        <include name="**/*.jar"/>

          <fileset refid="${profiler.roots.path}" />
      </rootspath>
    </nbprofiledirect>
  </target>
  
  <target name="tryme-profile" depends="-profile-check,-tryme-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent" description="Start IDE in profiler. May only be called from within IDE.">
    <startprofiler/>
    <antcall target="tryme"/>
  </target>
  
  <target name="tryme" depends="-load-build-properties,tryme-setup-debug-args,-jdk-init"

Lines 692-697 Link Here

(-)a/nbbuild/templates/common.xml (-1 / +31 lines)
692	<attribute name="test.type"/>	692	<attribute name="test.type"/>
693	<sequential>	693	<sequential>
694	<fail unless="test.includes">Must set test.includes</fail>	694	<fail unless="test.includes">Must set test.includes</fail>
		695	<property name="run.jvmargs.ide" value=""/>
695	<mkdir dir="${build.test.@{test.type}.results.dir}"/>	696	<mkdir dir="${build.test.@{test.type}.results.dir}"/>
696	<junit showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed" filtertrace="${test.filter.trace}" tempdir="${build.test.@{test.type}.results.dir}" timeout="${test.timeout}">	697	<junit showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed" filtertrace="${test.filter.trace}" tempdir="${build.test.@{test.type}.results.dir}" timeout="${test.timeout}">
697	<batchtest todir="${build.test.@{test.type}.results.dir}">	698	<batchtest todir="${build.test.@{test.type}.results.dir}">
Lines 701-706 Link Here
701	<syspropertyset refid="test.@{test.type}.properties"/>	702	<syspropertyset refid="test.@{test.type}.properties"/>
702	<jvmarg line="${test.run.args}"/>	703	<jvmarg line="${test.run.args}"/>
703	<jvmarg line="${test.bootclasspath.prepend.args}"/>	704	<jvmarg line="${test.bootclasspath.prepend.args}"/>
		705	<jvmarg line="${run.args.ide}"/>
		706	<jvmarg line="${run.jvmargs.ide}"/>
704	<formatter type="brief" usefile="false"/>	707	<formatter type="brief" usefile="false"/>
705	<formatter type="xml"/>	708	<formatter type="xml"/>
706	</junit>	709	</junit>
Lines 708-713 Link Here
708	</sequential>	711	</sequential>
709	</macrodef>	712	</macrodef>
710	<property name="test.type" value="unit"/>	713	<property name="test.type" value="unit"/>
		714	<property name="run.args.ide" value=""/>
		715
711	<test-single test.type="${test.type}"/>	716	<test-single test.type="${test.type}"/>
712	</target>	717	</target>
713		718
Lines 776-781 Link Here
776	<sequential>	781	<sequential>
777	<fail unless="test.class">Must set test.class</fail>	782	<fail unless="test.class">Must set test.class</fail>
778	<fail unless="test.methods">Must set test.methods</fail>	783	<fail unless="test.methods">Must set test.methods</fail>
		784	<property name="run.jvmargs.ide" value=""/>
779	<mkdir dir="${build.test.@{test.type}.results.dir}"/>	785	<mkdir dir="${build.test.@{test.type}.results.dir}"/>
780	<junit showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed" filtertrace="${test.filter.trace}" tempdir="${build.test.@{test.type}.results.dir}" timeout="${test.timeout}">	786	<junit showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed" filtertrace="${test.filter.trace}" tempdir="${build.test.@{test.type}.results.dir}" timeout="${test.timeout}">
781	<test name="${test.class}" methods="${test.methods}" todir="${build.test.@{test.type}.results.dir}"/>	787	<test name="${test.class}" methods="${test.methods}" todir="${build.test.@{test.type}.results.dir}"/>
Lines 783-788 Link Here
783	<syspropertyset refid="test.@{test.type}.properties"/>	789	<syspropertyset refid="test.@{test.type}.properties"/>
784	<jvmarg line="${test.run.args}"/>	790	<jvmarg line="${test.run.args}"/>
785	<jvmarg line="${test.bootclasspath.prepend.args}"/>	791	<jvmarg line="${test.bootclasspath.prepend.args}"/>
		792	<jvmarg line="${run.jvmargs.ide}"/>
786	<formatter type="brief" usefile="false"/>	793	<formatter type="brief" usefile="false"/>
787	<formatter type="xml"/>	794	<formatter type="xml"/>
788	</junit>	795	</junit>
Lines 799-814 Link Here
799	<element name="customize" optional="true"/>	806	<element name="customize" optional="true"/>
800	<sequential>	807	<sequential>
801	<fail unless="main.class">Must set main.class.</fail>	808	<fail unless="main.class">Must set main.class.</fail>
		809	<property name="run.jvmargs.ide" value=""/>
802	<mkdir dir="${build.test.@{test.type}.results.dir}"/>	810	<mkdir dir="${build.test.@{test.type}.results.dir}"/>
803	<java classname="${main.class}" dir="${build.test.@{test.type}.results.dir}" fork="true">	811	<java classname="${main.class}" dir="${build.test.@{test.type}.results.dir}" fork="true">
804	<classpath refid="test.@{test.type}.run.cp"/>	812	<classpath refid="test.@{test.type}.run.cp"/>
805	<syspropertyset refid="test.@{test.type}.properties"/>	813	<syspropertyset refid="test.@{test.type}.properties"/>
806	<jvmarg line="${test.run.args}"/>	814	<jvmarg line="${test.run.args}"/>
		815	<jvmarg line="${run.args.ide}"/>
		816	<jvmarg line="${run.jvmargs.ide"/>
807	<customize/>	817	<customize/>
808	</java>	818	</java>
809	</sequential>	819	</sequential>
810	</macrodef>	820	</macrodef>
811	<property name="test.type" value="unit"/> <!-- compatibility -->	821	<property name="test.type" value="unit"/> <!-- compatibility -->
		822	<property name="run.args.ide" value=""/> <!-- default -->
812	<tjava test.type="${test.type}"/>	823	<tjava test.type="${test.type}"/>
813	</target>	824	</target>
814		825
Lines 875-881 Link Here
875	<debug-fix-test-nb test.type="${test.type}"/>	886	<debug-fix-test-nb test.type="${test.type}"/>
876	</target>	887	</target>
877		888
878	<target name="profile-test-single-nb" depends="init,test-init,test-build,-jdk-presetdef-nbprofiledirect">	889	<target name="-profile-check" if="netbeans.home">
		890	<condition property="profiler.configured">
		891	<or>
		892	<contains string="${run.args.ide}" substring="-agentpath:" casesensitive="false"/>
		893	<contains string="${run.args.ide}" substring="-javaagent:" casesensitive="false"/>
		894	</or>
		895	</condition>
		896	</target>
		897
		898	<target name="-profile-test-single-nb-pre72" depends="init,test-init,test-build,-jdk-presetdef-nbprofiledirect" if="profiler.info.jvmargs.agent">
879	<macrodef name="profile-test-single-nb">	899	<macrodef name="profile-test-single-nb">
880	<attribute name="test.type"/>	900	<attribute name="test.type"/>
881	<sequential>	901	<sequential>
Lines 905-910 Link Here
905	<profile-test-single-nb test.type="${test.type}"/>	925	<profile-test-single-nb test.type="${test.type}"/>
906	</target>	926	</target>
907		927
		928	<target name="profile-test-single-nb" depends="-profile-check,init,test-init,test-build,-profile-test-single-nb-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent">
		929	<startprofiler/>
		930	<antcall target="test-single"/>
		931	</target>
		932
		933	<target name="profile-test-main-nb" depends="-profile-check,init,test-init,test-build" if="profiler.configured" unless="profiler.info.jvmargs.agent">
		934	<startprofiler/>
		935	<antcall target="run-test-main"/>
		936	</target>
		937
908	<target name="-javadoc-init" depends="init">	938	<target name="-javadoc-init" depends="init">
909	<!-- #71884: default Javadoc title and header -->	939	<!-- #71884: default Javadoc title and header -->
910	<property file="${manifest.mf}" prefix="mf."/>	940	<property file="${manifest.mf}" prefix="mf."/>

Lines 41-46 Link Here

(-)a/profiler.api/src/org/netbeans/modules/profiler/api/project/ProjectProfilingSupport.java (-1 / +2 lines)
41	*/	41	*/
42	package org.netbeans.modules.profiler.api.project;	42	package org.netbeans.modules.profiler.api.project;
43		43
		44	import java.util.Map;
44	import java.util.Properties;	45	import java.util.Properties;
45	import org.netbeans.lib.profiler.common.SessionSettings;	46	import org.netbeans.lib.profiler.common.SessionSettings;
46	import org.netbeans.modules.profiler.api.JavaPlatform;	47	import org.netbeans.modules.profiler.api.JavaPlatform;
Lines 122-128 Link Here
122	* @param props properties	123	* @param props properties
123	* @param profiledClassFile profiled file or null for profiling the entire project	124	* @param profiledClassFile profiled file or null for profiling the entire project
124	*/	125	*/
125	public void configurePropertiesForProfiling(Properties props, FileObject profiledClassFile) {	126	public void configurePropertiesForProfiling(Map props, FileObject profiledClassFile) {
126	provider.configurePropertiesForProfiling(props, profiledClassFile);	127	provider.configurePropertiesForProfiling(props, profiledClassFile);
127	}	128	}
128		129




 */
package org.netbeans.modules.profiler.spi.project;

import java.util.Map;
import java.util.Properties;
import org.netbeans.lib.profiler.common.SessionSettings;
import org.netbeans.modules.profiler.api.JavaPlatform;

     * @param props properties
     * @param profiledClassFile profiled file or null for profiling the entire project
     */
    public abstract void configurePropertiesForProfiling(Map<String, String> props, FileObject profiledClassFile);
    
    /**
     * Configures project-specific session settings.

        }

        @Override
        public void configurePropertiesForProfiling(Map<String, String> props, FileObject profiledClassFile) {
        }

        @Override

Lines 122-127 Link Here

(-)a/profiler.freeform/nbproject/project.xml (+17 lines)
122	</run-dependency>	122	</run-dependency>
123	</dependency>	123	</dependency>
124	<dependency>	124	<dependency>
		125	<code-name-base>org.netbeans.modules.project.ant</code-name-base>
		126	<build-prerequisite/>
		127	<compile-dependency/>
		128	<run-dependency>
		129	<release-version>1</release-version>
		130	<specification-version>1.46</specification-version>
		131	</run-dependency>
		132	</dependency>
		133	<dependency>
125	<code-name-base>org.netbeans.modules.projectapi</code-name-base>	134	<code-name-base>org.netbeans.modules.projectapi</code-name-base>
126	<build-prerequisite/>	135	<build-prerequisite/>
127	<compile-dependency/>	136	<compile-dependency/>
Lines 154-159 Link Here
154	<specification-version>8.0</specification-version>	163	<specification-version>8.0</specification-version>
155	</run-dependency>	164	</run-dependency>
156	</dependency>	165	</dependency>
		166	<dependency>
		167	<code-name-base>org.openide.util.lookup</code-name-base>
		168	<build-prerequisite/>
		169	<compile-dependency/>
		170	<run-dependency>
		171	<specification-version>8.12</specification-version>
		172	</run-dependency>
		173	</dependency>
157	</module-dependencies>	174	</module-dependencies>
158	<public-packages/>	175	<public-packages/>
159	</data>	176	</data>




 */
package org.netbeans.modules.profiler.freeform;

import java.util.Map;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.w3c.dom.Element;
import org.netbeans.modules.ant.freeform.spi.ProjectAccessor;
import org.netbeans.modules.profiler.api.JavaPlatform;
import org.netbeans.modules.profiler.api.java.JavaProfilerSource;
import org.netbeans.modules.profiler.nbimpl.project.JavaProjectProfilingSupportProvider;
import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;
import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.netbeans.spi.project.support.ant.EditableProperties;

/**
 * A class providing basic support for profiling free-form projects.

@ProjectServiceProvider(service=org.netbeans.modules.profiler.spi.project.ProjectProfilingSupportProvider.class, 
                        projectTypes={@ProjectType(id="org-netbeans-modules-ant-freeform", position=1210)}) // NOI18N
public final class FreeFormProjectProfilingSupportProvider extends JavaProjectProfilingSupportProvider {
    private static final String NBJDK_PROPERTIES = "nbproject/nbjdk.properties"; // NOI18N
    private static final String NBJDK_ACTIVE = "nbjdk.active"; // NOI18N

    @Override
    public boolean checkProjectIsModifiedForProfiler() {

    }

    @Override
    public void configurePropertiesForProfiling(final Map<String, String> props, final FileObject profiledClassFile) {
        if (profiledClassFile != null) { // In case the class to profile is explicitely selected (profile-single)
            // 1. specify profiled class name


            JavaProfilerSource src = JavaProfilerSource.createFrom(profiledClassFile);
            if (src != null) {
                final String profiledClass = src.getTopLevelClass().getQualifiedName();
                props.put("profile.class", profiledClass); //NOI18N

                // 2. include it in javac.includes so that the compile-single picks it up
                final String clazz = FileUtil.getRelativePath(ProjectUtilities.getRootOf(ProjectUtilities.getSourceRoots(getProject()),
                        profiledClassFile), profiledClassFile);
                props.put("javac.includes", clazz); //NOI18N
            }
        }
    }

    @Override
    public JavaPlatform resolveProjectJavaPlatform() {
        ProjectAccessor acc = getProject().getLookup().lookup(ProjectAccessor.class);
        EditableProperties ep = acc.getHelper().getProperties(NBJDK_PROPERTIES);
        String platformName = ep.getProperty(NBJDK_ACTIVE);

        return getPlatformByName(platformName);
    }

    @Override
    public boolean isProfilingSupported() {
        boolean supported = super.isProfilingSupported();
        if (!supported) return false;
        
        final String WEB_MODULE_PROVIDER_TYPE = "org.netbeans.modules.web.freeform.WebModules";
        
        for(Object x : getProject().getLookup().lookupAll(Object.class)) {
            if (WEB_MODULE_PROVIDER_TYPE.equals(x.getClass().getName())) {
                return false; // web freeforms are not supported
            }
        }
        return true;
    }
    
    public FreeFormProjectProfilingSupportProvider(Project project) {
        super(project);
    }

}




import org.netbeans.modules.profiler.api.JavaPlatform;
import org.netbeans.modules.profiler.api.java.JavaProfilerSource;
import org.netbeans.modules.profiler.api.ProfilerDialogs;
import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher;
import org.netbeans.modules.profiler.nbimpl.project.JavaProjectProfilingSupportProvider;
import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;
import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;

    // --- ProjectTypeProfiler implementation ------------------------------------------------------------------------------

    @Override
    public JavaPlatform resolveProjectJavaPlatform() {
        String serverInstanceID = getServerInstanceID(getProject());

        if (serverInstanceID == null) {

    }

    @Override
    public void configurePropertiesForProfiling(final Map<String, String> props, final FileObject profiledClassFile) {
        Project project = getProject();
        initAntPlatform(project, props);
        // set forceRestart
        props.put("profiler.j2ee.serverForceRestart", "true"); // NOI18N
                                                                       // set timeout

        props.put("profiler.j2ee.serverStartupTimeout", "300000"); // NOI18N
                                                                           // set agent id

        props.put("profiler.j2ee.agentID", "-Dnbprofiler.agentid=" + new Integer(generateAgentID()).toString()); // NOI18N // sets lastAgentID
                                                                                                                         // redirect profiler.info.jvmargs to profiler.info.jvmargs.extra
                                                                                                                         // NOTE: disabled as a workaround for Issue 102323, needs to be fixed in order to restore the OOME detection functionality!

        String jvmArgs = props.get("profiler.info.jvmargs"); // NOI18N

        if ((jvmArgs != null) && (jvmArgs.trim().length() > 0)) {
            props.put("profiler.info.jvmargs.extra", jvmArgs);
        }

        // fix agent startup arguments
        JavaPlatform javaPlatform = getJavaPlatformFromAntName(project, props);
        props.put("profiler.java.platform", javaPlatform.getPlatformId()); // set the used platform ant property

        String javaVersion = javaPlatform.getPlatformJDKVersion();
        String localPlatform = IntegrationUtils.getLocalPlatform(javaPlatform.getPlatformArchitecture());

        if (javaVersion.equals(CommonConstants.JDK_15_STRING)) {
            // JDK 1.5 used
            props.put("profiler.info.jvmargs.agent", // NOI18N
                              IntegrationUtils.getProfilerAgentCommandLineArgs(localPlatform, IntegrationUtils.PLATFORM_JAVA_50,
                                                                               false,
                                                                               ProfilerIDESettings.getInstance().getPortNo()));
        } else {
            // JDK 1.6 or later used
            props.put("profiler.info.jvmargs.agent", // NOI18N
                              IntegrationUtils.getProfilerAgentCommandLineArgs(localPlatform, IntegrationUtils.PLATFORM_JAVA_60,
                                                                               false,
                                                                               ProfilerIDESettings.getInstance().getPortNo()));


        String loadGenPath = LoadGenPanel.hasInstance() ? LoadGenPanel.instance().getSelectedScript() : null;
        if (loadGenPath != null) {
            props.put("profiler.loadgen.path", loadGenPath); // TODO factor out "profiler.loadgen.path" to a constant
        }

        if (profiledClassFile == null) {

        JavaProfilerSource src = JavaProfilerSource.createFrom(profiledClassFile);
        if (src != null) {
            String profiledClass = src.getTopLevelClass().getQualifiedName();
            props.put("profile.class", profiledClass); //NOI18N
            // include it in javac.includes so that the compile-single picks it up
            final String clazz = FileUtil.getRelativePath(ProjectUtilities.getRootOf(
                    ProjectUtilities.getSourceRoots(project),profiledClassFile), 
                    profiledClassFile);
            props.put("javac.includes", clazz); //NOI18N
        }
    }


                                                            FileUtil.toFile(project.getProjectDirectory()).getAbsolutePath()) : ""); // NOI18N
        ss.setJVMArgs(""); // NOI18N
        ss.setWorkingDir(""); // NOI18N
        
        super.setupProjectSessionSettings(ss);
    }

    @Override

        return Deployment.getDefault().getJ2eePlatform(serverInstanceID);
    }

    private static JavaPlatform getJavaPlatformFromAntName(Project project, Map<String, String> props) {
        String javaPlatformAntName = props.get("profiler.info.javaPlatform"); // NOI18N

        if (javaPlatformAntName.equals("default_platform")) {
            return JavaPlatform.getDefaultPlatform();

        return (int) (Math.random() * (float) Integer.MAX_VALUE);
    }

    private void initAntPlatform(Project project, Map<String, String> props) {
        String javaPlatformAntName = props.get("profiler.info.javaPlatform"); // NOI18N

        if (javaPlatformAntName == null) {
            JavaPlatform platform = getProjectJavaPlatform();
            J2eePlatform j2eepf = getJ2eePlatform(project); // try to get the J2EE Platform
            String platformId;
            
            if (platform == null) {
                platformId = JavaPlatform.getDefaultPlatform().getPlatformId(); // no Platform sepcified; use the IDE default JVM platform
            } else {
                platformId = platform.getPlatformId();
                platformId = jpprops.get("platform.ant.name");
            }

            props.put("profiler.info.javaPlatform", platformId); // set the used platform ant property
        }
    }





import java.util.Collections;
import java.util.List;
import org.netbeans.api.extexecution.startup.StartupExtender.StartMode;
import org.netbeans.api.project.Project;
import org.netbeans.api.server.ServerInstance;
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
import org.netbeans.modules.j2ee.deployment.profiler.spi.Profiler;

 */
@StartupExtenderImplementation.Registration(position=100, displayName="#DESC_Profiler",
        startMode=StartMode.PROFILE)
public class ServerProfilerArgsProvider implements StartupExtenderImplementation {

    @Override
    public List<String> getArguments(Lookup context, StartMode mode) {
        if (context.lookup(Project.class) == null) { // project related execution is handled elsewhere
            Profiler p = Lookup.getDefault().lookup(Profiler.class);
            ServerInstance server = context.lookup(ServerInstance.class);
            if (server != null) {
                InstanceProperties ip = server.getLookup().lookup(InstanceProperties.class);
                if (ip != null) {
                    return Arrays.asList(p.getSettings(ip.getProperty("url"), false).getJvmArgs()); //NOI18N
                }
            }
        }

        return Collections.EMPTY_LIST;
    }





package org.netbeans.modules.profiler.j2se;

import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.lib.profiler.common.SessionSettings;
import org.netbeans.modules.profiler.projectsupport.utilities.AppletSupport;
import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;
import org.netbeans.spi.project.support.ant.*;
import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.modules.InstalledFileLocator;
import java.io.*;
import java.net.URL;
import java.util.Map;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.event.ChangeListener;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.profiler.api.JavaPlatform;
import org.netbeans.modules.profiler.api.java.JavaProfilerSource;
import org.netbeans.modules.profiler.api.java.ProfilerTypeUtils;

import org.netbeans.modules.profiler.spi.project.ProjectProfilingSupportProvider;
import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.openide.modules.InstalledFileLocator;


/**

@ProjectServiceProvider(service=ProjectProfilingSupportProvider.class, 
                        projectTypes={@ProjectType(id="org-netbeans-modules-java-j2seproject",position=550)}) // NOI18N
public class J2SEProjectProfilingSupportProvider extends JavaProjectProfilingSupportProvider {
    final private static Logger LOG = Logger.getLogger(J2SEProjectProfilingSupportProvider.class.getName());

    private static class MyPropertyProvider implements PropertyProvider {
        //~ Instance fields ------------------------------------------------------------------------------------------------------

        }
    }

    //~ Static fields/initializers -----------------------------------------------------------------------------------------------

    // -----
    // I18N String constants                                                                                                                   // -----
    public static final ErrorManager err = ErrorManager.getDefault().getInstance("org.netbeans.modules.profiler.j2se"); // NOI18N

    //~ Instance fields ----------------------------------------------------------------------------------------------------------
    private String mainClassSetManually = null; // used for case when the main class is not set in project and user is prompted for it


    }

    @Override
    public JavaPlatform resolveProjectJavaPlatform() {
        PropertyEvaluator props = getProjectProperties(getProject());
        String platformName = props.getProperty("platform.active"); // NOI18N


            return null; // not provided for some reason
        }

        if (platformName.equals("default_platform")) { // NOI18N
            return JavaPlatform.getDefaultPlatform(); 
        }

        return JavaPlatform.getJavaPlatformById(platformName);
    }


    }

    @Override
    public void configurePropertiesForProfiling(final Map<String, String> props, final FileObject profiledClassFile) {
        if (profiledClassFile == null) {
            if (mainClassSetManually != null) {
                props.put("main.class", mainClassSetManually); // NOI18N

            if (src != null) {
                Project project = getProject();
                if (src.isApplet()) {
                    String jvmargs = props.get("run.jvmargs"); // NOI18N

                    URL url = null;


                        AppletSupport.generateSecurityPolicy(project.getProjectDirectory(), buildFolder);

                        if ((jvmargs == null) || (jvmargs.length() == 0)) {
                            props.put("run.jvmargs",
                                              "-Djava.security.policy=" + FileUtil.toFile(buildFolder).getPath() + File.separator
                                              + "applet.policy"); //NOI18N
                        } else {
                            props.put("run.jvmargs",
                                              jvmargs + " -Djava.security.policy=" + FileUtil.toFile(buildFolder).getPath()
                                              + File.separator + "applet.policy"); //NOI18N
                        }

                        return; // TODO: fail?
                    }

                    props.put("applet.url", url.toString()); // NOI18N
                } else {
                    final String profiledClass = src.getTopLevelClass().getQualifiedName();
                    props.put("profile.class", profiledClass); //NOI18N
                }

                // 2. include it in javac.includes so that the compile-single picks it up
                final String clazz = FileUtil.getRelativePath(ProjectUtilities.getRootOf(ProjectUtilities.getSourceRoots(project),
                                                                                         profiledClassFile), profiledClassFile);
                props.put("javac.includes", clazz); //NOI18N
            }
        }
    }


        String jvmArgs = pp.getProperty("run.jvmargs"); // NOI18N
        ss.setJVMArgs((jvmArgs != null) ? jvmArgs : ""); // NOI18N
        
        super.setupProjectSessionSettings(ss);
    }

    @Override

                                is.close();
                            }
                        } catch (IOException e) {
                            LOG.log(Level.INFO, null, e);
                        }
                    }


                                is.close();
                            }
                        } catch (IOException e) {
                            LOG.log(Level.INFO, null, e);
                        }
                    }


                                is.close();
                            }
                        } catch (IOException e) {
                            LOG.log(Level.INFO, null, e);
                        }
                    }


                                is.close();
                            }
                        } catch (IOException e) {
                            LOG.log(Level.INFO, null, e);
                        }
                    }
                }




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 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]"
 *
 * Contributor(s):
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * 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.
 */

package org.netbeans.modules.profiler.ant;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Path;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.lib.profiler.common.AttachSettings;
import org.netbeans.lib.profiler.common.Profiler;
import org.netbeans.lib.profiler.common.ProfilingSettings;
import org.netbeans.modules.profiler.NetBeansProfiler;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import java.io.File;
import java.io.IOException;
import java.util.Hashtable;
import javax.swing.*;


/** Ant task to start the NetBeans profiler attach action.
 *
 * @author Tomas Hurka
 * @author Ian Formanek
 */
public final class NBProfileAttachTask extends Task {
    //~ Instance fields ----------------------------------------------------------------------------------------------------------

    /** Explicit classpath of the profiled process. */
    private Path classpath = null;
    private String port = null;
    private boolean direct = true;
    private boolean directDefinedExplicitely = false;

    //~ Methods ------------------------------------------------------------------------------------------------------------------

    public void setDirect(final boolean aos) {
        this.direct = aos;
        directDefinedExplicitely = true;
    }

    public void setPort(final String port) {
        this.port = port;
    }

    // properties -----------------------------------------------------------------

    /** "classpath" subelements, only one is allowed
     * @param path the classpath
     */
    public void addClasspath(final Path path) {
        if (classpath != null) {
            throw new BuildException("Only one classpath subelement is supported"); //NOI18N
        }

        classpath = path;
    }

    // main methods ---------------------------------------------------------------
    public void execute() throws BuildException {
        Project antProject = getProject();
        final Hashtable props = antProject.getProperties();
        final ProfilingSettings ps = new ProfilingSettings();

        // 1. process parameters passed via Properties
        ps.load(props);

        final AttachSettings as = new AttachSettings();
        as.load(antProject.getProperties());

        // 2. Process those passed as attributes/elements from the buildl script
        if (directDefinedExplicitely) {
            as.setDirect(Boolean.valueOf(direct).booleanValue());
        }

        if (port != null) {
            try {
                final int portNo = Integer.parseInt(port);
                as.setPort(portNo);
            } catch (NumberFormatException e) {
            } // ignore, will not be used
        }

        // 3. log used properties in verbose level
        antProject.log("Attaching to Profiled Application", Project.MSG_VERBOSE); //NOI18N
        antProject.log("  classpath: " + classpath, Project.MSG_VERBOSE); //NOI18N
        antProject.log("  attach direct: " + as.isDirect(), Project.MSG_VERBOSE); //NOI18N
        antProject.log("  remote attach: " + as.isRemote(), Project.MSG_VERBOSE); //NOI18N
        antProject.log("  remote host: " + as.getHost(), Project.MSG_VERBOSE); //NOI18N
        antProject.log("  profiler port: " + as.getPort(), Project.MSG_VERBOSE); //NOI18N

        // 4. log profiling and session settings in debug level
        antProject.log("  profiling settings: " + ps.debug(), Project.MSG_DEBUG); //NOI18N
        antProject.log("  attach settings: " + as.debug(), Project.MSG_DEBUG); //NOI18N

        // 5. determine project being profiled
        org.netbeans.api.project.Project profiledProject = null;

        String projectDir = (String) props.get("profiler.info.project.dir"); //NOI18N

        if (projectDir != null) {
            FileObject projectFO = FileUtil.toFileObject(FileUtil.normalizeFile(new File(projectDir)));

            if (projectFO != null) {
                try {
                    profiledProject = ProjectManager.getDefault().findProject(projectFO);
                } catch (IOException e) {
                    antProject.log("Could not determine project: " + e.getMessage(), Project.MSG_WARN); //NOI18N
                }
            }
        }

        // 6. invoke profiling with constructed profiling and attach settings
        ((NetBeansProfiler) Profiler.getDefault()).setProfiledProject(profiledProject, null);
        Profiler.getDefault().attachToApp(ps, as);
    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 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]"
 *
 * Contributor(s):
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * 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.
 */

package org.netbeans.modules.profiler.ant;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.Path;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.lib.profiler.client.ClientUtils;
import org.netbeans.lib.profiler.common.Profiler;
import org.netbeans.lib.profiler.common.ProfilingSettings;
import org.netbeans.lib.profiler.common.SessionSettings;
import org.netbeans.lib.profiler.global.CalibrationDataFileIO;
import org.netbeans.modules.profiler.NetBeansProfiler;
import org.netbeans.modules.profiler.api.ProfilerIDESettings;
import org.netbeans.modules.profiler.ProfilerModule;
import org.netbeans.modules.profiler.actions.JavaPlatformSelector;
import org.netbeans.modules.profiler.actions.ProfilingSupport;
import org.netbeans.modules.profiler.utils.IDEUtils;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbBundle;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import org.netbeans.modules.profiler.api.JavaPlatform;
import org.netbeans.modules.profiler.api.ProfilerDialogs;
import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;


/**
 * Ant task to start the NetBeans profiler profile action.
 * <p/>
 * Will put the profiler into listening mode, placing the port number into the "profiler.port" property.
 * The target app then should be started through the profiler agent passing it this port number.
 *
 * @author Tomas Hurka
 * @author Ian Formanek
 */
public final class NBProfileDirectTask extends Task {
    //~ Inner Classes ------------------------------------------------------------------------------------------------------------

    /**
     * Enumerated attribute with the values "asis", "add" and "remove".
     */
    public static class YesNoAuto extends EnumeratedAttribute {
        //~ Methods --------------------------------------------------------------------------------------------------------------

        public String[] getValues() {
            return new String[] { "yes", "true", "no", "false", "auto" }; //NOI18N
        }
    }

    //~ Static fields/initializers -----------------------------------------------------------------------------------------------

    // -----
    // I18N String constants
    private static final String CALIBRATION_FAILED_MESSAGE = NbBundle.getMessage(ProfilerModule.class,
                                                                                 "ProfilerModule_CalibrationFailedMessage"); //NOI18N
                                                                                                                             // -----
    private static final int INTERACTIVE_AUTO = 0;
    private static final int INTERACTIVE_YES = 1;
    private static final int INTERACTIVE_NO = 2;
    private static final String DEFAULT_AGENT_JVMARGS_PROPERTY = "profiler.info.jvmargs.agent"; // NOI18N
    private static final String DEFAULT_JVM_PROPERTY = "profiler.info.jvm"; // NOI18N
    private static final String EXTRA_JVM_ARGS = "profiler.info.jvmargs"; // NOI18N
    private static final String EXTRA_RUN_ARGS = "run.args.extra"; // NOI18N

    //~ Instance fields ----------------------------------------------------------------------------------------------------------

    /**
     * Explicit classpath of the profiled process.
     */
    private Path classpath = null;
    private Path rootsPath = null;
    private String jvmArgsPrefix = ""; // NOI18N
    private String jvmArgsProperty = DEFAULT_AGENT_JVMARGS_PROPERTY;
    private String jvmProperty = DEFAULT_JVM_PROPERTY;
    private String mainClass = null;
    private int interactive = INTERACTIVE_AUTO;

    //~ Methods ------------------------------------------------------------------------------------------------------------------

    public void setInteractive(YesNoAuto arg) {
        String value = arg.getValue();

        if (value.equals("auto")) { //NOI18N
            interactive = INTERACTIVE_AUTO;
        } else if (value.equals("yes") || value.equals("true")) { // NOI18N
            interactive = INTERACTIVE_YES;
        } else if (value.equals("no") || value.equals("false")) { // NOI18N
            interactive = INTERACTIVE_NO;
        }
    }

    public void setJvmArgsPrefix(String value) {
        jvmArgsPrefix = value;
    }

    public void setJvmArgsProperty(String value) {
        jvmArgsProperty = value;
    }

    public void setJvmProperty(String value) {
        jvmProperty = value;
    }

    // -- Properties -------------------------------------------------------------------------------------------------------
    public void setMainClass(String mainClass) {
        this.mainClass = mainClass;
    }

    /**
     * "classpath" subelements, only one is allowed
     *
     * @param path the classpath
     */
    public void addClasspath(final Path path) {
        if (classpath != null) {
            throw new BuildException("Only one classpath subelement is supported"); //NOI18N
        }

        classpath = path;
    }

    /**
     * "classpath" subelements, only one is allowed
     *
     * @param path the classpath
     */
    public void addRootspath(final Path path) {
        if (rootsPath != null) {
            throw new BuildException("Only one classpath subelement is supported"); //NOI18N
        }

        rootsPath = path;
    }

    // -- Main methods -----------------------------------------------------------------------------------------------------
    public void execute() throws BuildException {
        // Settings are created this way:
        //   1. project context (stored as properties)
        //   2. profiling settings (configuration)
        //         - possibly override some of the settings from 1. if ps.getOverrideGlobalSettings() is set
        //   3. explicitely override anything and everything in the build script
        Project antProject = getProject();
        final Hashtable props = antProject.getProperties();
        ProfilingSettings ps = new ProfilingSettings();
        final SessionSettings ss = new SessionSettings();
        String projectDir = (String) props.get("profiler.info.project.dir"); //NOI18N
        String singleFile = (String) props.get("profiler.info.single.file"); //NOI18N

        boolean initializedInteractively = false;

        if ((props.get(DEFAULT_AGENT_JVMARGS_PROPERTY) == null) || (interactive == INTERACTIVE_YES)) {
            if (interactive != INTERACTIVE_NO) {
                projectDir = initializeInteractively(ps, ss);
                initializedInteractively = true;
            }
        }

        if (!initializedInteractively) {
            if (props.get(DEFAULT_AGENT_JVMARGS_PROPERTY) == null) {
                throw new BuildException("Missing context for nbprofiledirect task.\n" //NOI18N
                                         + "Please set the \"interactive\" attribute to \"true\" or set the required properties." //NOI18N
                                         );
            }

            if (!DEFAULT_AGENT_JVMARGS_PROPERTY.equals(jvmArgsProperty) || !"".equals(jvmArgsPrefix)) { //NOI18N

                String args = " " + (String) props.get(EXTRA_JVM_ARGS); // get the extra JVM args
                                                                        // reformat the string to the form suitable for starting the NB platform

                args = args.replaceAll("\\s+(\\-)", " -J$1"); // NOI18N

                String origArgs = antProject.getProperty(EXTRA_RUN_ARGS);
                origArgs = (origArgs != null) ? (" " + origArgs + " ") : ""; // NOI18N

                antProject.setProperty("run.args.extra", origArgs + args); // merge the profiler extra JVM args with the platform extra JVM args

                String usedAgentJvmArgs = jvmArgsPrefix + props.get(DEFAULT_AGENT_JVMARGS_PROPERTY);
                antProject.setProperty(jvmArgsProperty, usedAgentJvmArgs);
                antProject.log("Profiler agent JVM arguments: " + usedAgentJvmArgs, Project.MSG_VERBOSE); //NOI18N
                antProject.log("Profiler agent JVM arguments stored in property " + jvmArgsProperty, Project.MSG_INFO); //NOI18N
                antProject.log("Extra JVM arguments: " + antProject.getProperty("run.args.extra")); // NOI18N
            }

            // 2. process parameters passed via Properties
            ps.load(props);
            try {
                ss.load(props);
            } catch (IllegalArgumentException e) {
                ProfilerDialogs.displayWarning(e.getLocalizedMessage());
            }

            // get correct working directory available only at runtime (not from ProjectTypeProfiler!)
            String projectWorkDir = (String) props.get("work.dir"); // NOI18N
            ss.setWorkingDir(((projectWorkDir != null) && !"".equals(projectWorkDir.trim())) ? projectWorkDir
                                                                                             : System.getProperty("user.dir")); // NOI18N
        }

        // Correctly setup working directory
        String profilerInfoDir = (String) props.get("profiler.info.dir"); // NOI18N

        if (!initializedInteractively || (profilerInfoDir == null /* means that WD wasn't set in interactive setup */)
                || !"".equals(profilerInfoDir.trim())) { // NOI18N

            String workingDirectory = ss.getWorkingDir();

            if (ps.getOverrideGlobalSettings()) {
                String overridenWorkingDirectory = ps.getWorkingDir();

                if ((overridenWorkingDirectory != null) && !"".equals(overridenWorkingDirectory.trim())) {
                    workingDirectory = overridenWorkingDirectory; // NOI18N
                }
            }

            antProject.setProperty("profiler.info.dir", workingDirectory); // NOI18N
        }

        if (classpath != null) {
            ss.setMainClassPath(classpath.toString());
        }

        if (ps.getProfilingType() == ProfilingSettings.PROFILE_CPU_ENTIRE) {
            antProject.log("Roots path: " + rootsPath, Project.MSG_VERBOSE); //NOI18N

            if (rootsPath != null) {
                String[] paths = rootsPath.list();
                ArrayList al = new ArrayList();

                for (int i = 0; i < paths.length; i++) {
                    addPackagesList(al, paths[i]);
                }

                ClientUtils.SourceCodeSelection[] ret = new ClientUtils.SourceCodeSelection[al.size()];

                for (int i = 0; i < al.size(); i++) {
                    if ("".equals(al.get(i))) { //NOI18N
                        ret[i] = new ClientUtils.SourceCodeSelection("", "", ""); //NOI18N
                    } else {
                        ret[i] = new ClientUtils.SourceCodeSelection(((String) al.get(i)) + ".", "", ""); //NOI18N
                    }
                }

                ps.setInstrumentationRootMethods(ret);
            }
        }

        // 3. log used properties in verbose level
        antProject.log("Starting Profiled Application", Project.MSG_VERBOSE); //NOI18N
        antProject.log("  mainClass: " + ss.getMainClass(), Project.MSG_VERBOSE); //NOI18N
        antProject.log("  classpath: " + ss.getMainClassPath(), Project.MSG_VERBOSE); //NOI18N
        antProject.log("  arguments: " + ss.getMainArgs(), Project.MSG_VERBOSE); //NOI18N

        if (ps.getOverrideGlobalSettings()) {
            antProject.log("  jvm arguments: " + ps.getJVMArgs(), Project.MSG_VERBOSE); //NOI18N
        } else {
            antProject.log("  jvm arguments: " + ss.getJVMArgs(), Project.MSG_VERBOSE); //NOI18N
        }

        if (ps.getOverrideGlobalSettings()) {
            antProject.log("  working dir: " + ps.getWorkingDir(), Project.MSG_VERBOSE); //NOI18N
        } else {
            antProject.log("  working dir: " + ss.getWorkingDir(), Project.MSG_VERBOSE); //NOI18N
        }

        // 4. log profiling and session settings in debug level
        antProject.log("  profiling settings: " + ps.debug(), Project.MSG_DEBUG); //NOI18N
        antProject.log("  session settings: " + ss.debug(), Project.MSG_DEBUG); //NOI18N

        // 5. determine project being profiled
        org.netbeans.api.project.Project profiledProject = null;
        FileObject singleFO = null;

        if (projectDir != null) {
            String errorMessage = null;
            FileObject projectFO = FileUtil.toFileObject(FileUtil.normalizeFile(new File(projectDir)));

            if (projectFO != null) {
                try {
                    profiledProject = ProjectManager.getDefault().findProject(projectFO);
                } catch (IOException e) {
                    errorMessage = "IOException: " + e.getMessage(); //NOI18N
                }
            } else {
                errorMessage = "Could not find project directory: " + projectDir; //NOI18N
            }

            if (errorMessage != null) {
                antProject.log("Could not determine project: " + errorMessage, Project.MSG_INFO); //NOI18N
                antProject.log("Using global (no project) attach context", Project.MSG_INFO); //NOI18N
            }

            if (singleFile != null) {
                singleFO = FileUtil.toFileObject(FileUtil.normalizeFile(new File(singleFile)));
            }
        } else {
            antProject.log("You can use property profiler.info.project.dir to specify project that is being profiled.", //NOI18N
                             Project.MSG_VERBOSE);
        }

        final org.netbeans.api.project.Project projectToUse = profiledProject;

        if (!CalibrationDataFileIO.validateCalibrationInput(ss.getJavaVersionString(), ss.getJavaExecutable())
                || !Profiler.getDefault()
                                .runCalibration(true, ss.getJavaExecutable(), ss.getJavaVersionString(),
                                                    ss.getSystemArchitecture())) {
            ProfilerDialogs.displayError(CALIBRATION_FAILED_MESSAGE);
            throw new BuildException(CALIBRATION_FAILED_MESSAGE); // failed, cannot proceed
        }

        // 6. invoke profiling with constructed profiling and session settings
        final ProfilingSettings ps1 = ps;
        final FileObject singleFO1 = singleFO;

        NetBeansProfiler.getDefaultNB().setProfiledProject(projectToUse, singleFO1);
        Profiler.getDefault().connectToStartedApp(ps1, ss);
    }

    private void addPackagesForArchive(ArrayList list, String s, File f) {
        Project antProject = getProject();
        
        antProject.log("Add root packages for archive: " + f.getName(), Project.MSG_VERBOSE); //NOI18N
        try {
            JarFile jf = new JarFile(f);

            for (Enumeration e = jf.entries(); e.hasMoreElements();) {
                JarEntry je = (JarEntry) e.nextElement();
                antProject.log("Checking jar entry: " + je.getName(), Project.MSG_VERBOSE); //NOI18N

                if (!je.isDirectory() && je.getName().endsWith(".class")) { //NOI18N

                    String name = je.getName();
                    int idx = name.lastIndexOf('/'); //NOI18N
                    String packageName = (idx == -1) ? name : name.substring(0, idx);
                    packageName = packageName.replace('/', '.'); //NOI18N

                    if (!list.contains(packageName)) {
                        antProject.log("Adding package: " + packageName, Project.MSG_VERBOSE); //NOI18N
                        list.add(packageName);
                    }
                }
            }
        } catch (IOException e) {
            antProject.log("Failed to scan packages for archive: " + f.getName()); //NOI18N
        }
    }

    private void addPackagesForDirectory(ArrayList packages, String prefix, File f) {
        if (!f.isDirectory()) { // not a folder

            return;
        }

        getProject().log("Add root packages for directory: " + f.getName(), Project.MSG_VERBOSE); //NOI18N

        File[] children = f.listFiles();

        // 1. check if there are java sdources in this folder and if so, add to the list of packages
        if (!packages.contains(prefix)) { // already in there, skip this

            for (int i = 0; i < children.length; i++) {
                File child = children[i];

                if (child.getName().endsWith(".class")) { //NOI18N
                    getProject().log("Addding package: " + prefix, Project.MSG_VERBOSE); //NOI18N
                    packages.add(prefix);

                    break;
                }
            }
        }

        // 2. recurse into subfolders
        for (int i = 0; i < children.length; i++) {
            File child = children[i];

            if (child.isDirectory()) {
                if ("".equals(prefix)) { //NOI18N
                    addPackagesForDirectory(packages, child.getName(), child);
                } else {
                    addPackagesForDirectory(packages, prefix + "." + child.getName(), child); //NOI18N
                }
            }
        }
    }

    private void addPackagesList(ArrayList list, String path)
                          throws BuildException {
        File f = new File(path);

        if (!f.exists()) {
            getProject().log("Cannot find: " + path); //NOI18N

            return;
        }

        if (f.isDirectory()) {
            addPackagesForDirectory(list, "", f); //NOI18N
        } else if (f.getName().endsWith(".jar")) { //NOI18N
            addPackagesForArchive(list, "", f); //NOI18N
        }
    }

    private String initializeInteractively(ProfilingSettings ps, SessionSettings ss)
                                    throws BuildException {
        String projectDir = null;
        Project antProject = getProject();
        antProject.log("Entering interactive mode of nbprofiledirect task...", Project.MSG_VERBOSE); //NOI18N

        org.netbeans.api.project.Project p = ProjectUtilities.getProjectForBuildScript(getLocation().getFileName());

        if (p != null) {
            antProject.log("Using project: " + ProjectUtilities.getProjectName(p), Project.MSG_INFO); //NOI18N
            projectDir = FileUtil.toFile(p.getProjectDirectory()).getAbsolutePath();
        }

        ss.setPortNo(ProfilerIDESettings.getInstance().getPortNo());

        if (mainClass != null) {
            ss.setMainClass(mainClass);
        }

        JavaPlatform platform = JavaPlatform.getJavaPlatformById(ProfilerIDESettings.getInstance().getJavaPlatformForProfiling());

        if (platform == null) {
            platform = JavaPlatformSelector.getDefault().selectPlatformToUse();

            if (platform == null) {
                throw new BuildException("Cancelled..."); //NOI18N
            }
        }

        String javaFile = platform.getPlatformJavaFile();

        if (javaFile == null) {
            throw new BuildException("Cannot determine Java executable for platform: " + platform.getDisplayName()); //NOI18N
        }

        String javaVersion = platform.getPlatformJDKVersion();

        if (javaVersion == null) {
            throw new BuildException("Cannot determine Java version for the selected Java platform"); //NOI18N
        }

        ss.setJavaExecutable(javaFile);
        ss.setJavaVersionString(javaVersion);
        ss.setSystemArchitecture(platform.getPlatformArchitecture());

        ps = ProfilingSupport.getDefault().selectTaskForProfiling(p, ss, null, false);

        if (ps == null) {
            throw new BuildException("Cancelled by the user"); //NOI18N
        }

        String usedJavaExecutable = null;
        String usedJvmArgs = null;
        String usedWorkDir = null;

        if (ps.getOverrideGlobalSettings()) {
            antProject.log("Global settings are overridden by the profiling configuration", Project.MSG_VERBOSE); //NOI18N

            if (ps.getJavaPlatformName() != null) {
                usedJavaExecutable = Profiler.getDefault().getPlatformJavaFile(ps.getJavaPlatformName());
            }

            usedJvmArgs = ps.getJVMArgs();
            usedWorkDir = ps.getWorkingDir();

            if (usedJavaExecutable != null) {
                antProject.log("Overridden Java Executable: " + usedJavaExecutable //NOI18N
                                 + ", stored in property: " + jvmProperty, Project.MSG_VERBOSE //NOI18N
                );
                antProject.setProperty(jvmProperty, usedJavaExecutable);
            }

            if (usedJvmArgs != null) {
                antProject.log("Overridden Working Directory: " + usedWorkDir, Project.MSG_VERBOSE); //NOI18N
                antProject.setProperty("profiler.info.jvmargs", usedJvmArgs); // NOI18N
            }

            if (usedWorkDir != null) {
                antProject.setProperty("profiler.info.dir", usedWorkDir); // NOI18N
            }
        }

        String usedAgentJvmArgs = jvmArgsPrefix
                                  + IDEUtils.getAntProfilerStartArgument15(ss.getPortNo(), ss.getSystemArchitecture());
        antProject.setProperty(jvmArgsProperty, usedAgentJvmArgs); // NOI18N
        antProject.log("Profiler agent JVM arguments: " + usedAgentJvmArgs, Project.MSG_VERBOSE); //NOI18N
        antProject.log("Profiler agent JVM arguments stored in property " + jvmArgsProperty, Project.MSG_INFO); //NOI18N

        return projectDir;
    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 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 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.profiler.nbimpl;

import java.io.File;
import java.util.Map;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.lib.profiler.common.Profiler;
import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher;
import org.openide.filesystems.FileUtil;

/**
 *
 * @author Jaroslav Bachorik
 */
public class StartProfilerTask extends Task {
    private String freeformStr = "";
    private boolean isFreeForm = false;
    
    @Override
    public void execute() throws BuildException {
        ProfilerLauncher.Session s = ProfilerLauncher.getLastSession();
        if (s == null && isFreeForm) {
            File baseDir = getProject().getBaseDir();
            if (baseDir != null) {
                Project p = FileOwnerQuery.getOwner(FileUtil.toFileObject(baseDir));
                if (p != null) {
                    s = ProfilerLauncher.Session.createSession(p);
                }
            }
            
        }
        if (s != null) {
            Map<String, String> props = s.getProperties();
            if (props != null) {
                for(Map.Entry<String, String> e : props.entrySet()) {
                    getProject().setProperty(e.getKey(), e.getValue());
                }
                NetBeansProfiler.getDefaultNB().setupDispatcher(s.getProfilingSettings());
                Profiler.getDefault().connectToStartedApp(s.getProfilingSettings(), s.getSessionSettings());
                getProject().setProperty("profiler.configured", "true"); // NOI18N
            }
        }
    }
    
    public void setFreeform(String val) {
        freeformStr = val;
        isFreeForm = Boolean.parseBoolean(val);
    }
    
    public String getFreeform() {
        return freeformStr;
    }
}




<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

Copyright 2010 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.

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original
Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun
Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL

made subject to such option by the copyright holder.
-->
<antlib>
    <taskdef name="startprofiler" classname="org.netbeans.modules.profiler.nbimpl.StartProfilerTask"/>
  <taskdef name="nbprofiledirect" classname="org.netbeans.modules.profiler.ant.NBProfileDirectTask"/>
</antlib>

Lines 3-7 Link Here

(-)a/profiler.nbimpl/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.profiler.nbimpl/1	3	OpenIDE-Module: org.netbeans.modules.profiler.nbimpl/1
4	OpenIDE-Module-Layer: org/netbeans/modules/profiler/nbimpl/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/profiler/nbimpl/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/nbimpl/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/nbimpl/Bundle.properties
6	OpenIDE-Module-Provides: org.netbeans.lib.profiler.common.Profiler	6	OpenIDE-Module-Provides: org.netbeans.lib.profiler.common.Profiler,org.netbeans.api.profiler
7	OpenIDE-Module-Specification-Version: 1.2	7	OpenIDE-Module-Specification-Version: 1.2

Lines 59-64 Link Here

(-)a/profiler.nbimpl/nbproject/project.xml (+28 lines)
59	</run-dependency>	59	</run-dependency>
60	</dependency>	60	</dependency>
61	<dependency>	61	<dependency>
		62	<code-name-base>org.netbeans.api.annotations.common</code-name-base>
		63	<build-prerequisite/>
		64	<compile-dependency/>
		65	<run-dependency>
		66	<release-version>1</release-version>
		67	<specification-version>1.13</specification-version>
		68	</run-dependency>
		69	</dependency>
		70	<dependency>
62	<code-name-base>org.netbeans.api.java.classpath</code-name-base>	71	<code-name-base>org.netbeans.api.java.classpath</code-name-base>
63	<build-prerequisite/>	72	<build-prerequisite/>
64	<compile-dependency/>	73	<compile-dependency/>
Lines 68-73 Link Here
68	</run-dependency>	77	</run-dependency>
69	</dependency>	78	</dependency>
70	<dependency>	79	<dependency>
		80	<code-name-base>org.netbeans.api.progress</code-name-base>
		81	<build-prerequisite/>
		82	<compile-dependency/>
		83	<run-dependency>
		84	<release-version>1</release-version>
		85	<specification-version>1.27</specification-version>
		86	</run-dependency>
		87	</dependency>
		88	<dependency>
71	<code-name-base>org.netbeans.lib.profiler</code-name-base>	89	<code-name-base>org.netbeans.lib.profiler</code-name-base>
72	<build-prerequisite/>	90	<build-prerequisite/>
73	<compile-dependency/>	91	<compile-dependency/>
Lines 130-135 Link Here
130	</run-dependency>	148	</run-dependency>
131	</dependency>	149	</dependency>
132	<dependency>	150	<dependency>
		151	<code-name-base>org.netbeans.modules.extexecution</code-name-base>
		152	<build-prerequisite/>
		153	<compile-dependency/>
		154	<run-dependency>
		155	<release-version>2</release-version>
		156	<specification-version>1.30</specification-version>
		157	</run-dependency>
		158	</dependency>
		159	<dependency>
133	<code-name-base>org.netbeans.modules.java.platform</code-name-base>	160	<code-name-base>org.netbeans.modules.java.platform</code-name-base>
134	<build-prerequisite/>	161	<build-prerequisite/>
135	<compile-dependency/>	162	<compile-dependency/>
Lines 426-431 Link Here
426	<friend>org.netbeans.modules.profiler.j2ee</friend>	453	<friend>org.netbeans.modules.profiler.j2ee</friend>
427	<friend>org.netbeans.modules.profiler.j2se</friend>	454	<friend>org.netbeans.modules.profiler.j2se</friend>
428	<friend>org.netbeans.modules.profiler.nbmodule</friend>	455	<friend>org.netbeans.modules.profiler.nbmodule</friend>
		456	<package>org.netbeans.modules.profiler.nbimpl.actions</package>
429	<package>org.netbeans.modules.profiler.nbimpl.javac</package>	457	<package>org.netbeans.modules.profiler.nbimpl.javac</package>
430	<package>org.netbeans.modules.profiler.nbimpl.project</package>	458	<package>org.netbeans.modules.profiler.nbimpl.project</package>
431	</friend-packages>	459	</friend-packages>

Lines 50-55 Link Here

(-)a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/NetBeansProfiler.java (-5 / +14 lines)
50	import org.netbeans.lib.profiler.common.ProfilingSettings;	50	import org.netbeans.lib.profiler.common.ProfilingSettings;
51	import org.netbeans.modules.profiler.HeapDumpWatch;	51	import org.netbeans.modules.profiler.HeapDumpWatch;
52	import org.netbeans.modules.profiler.ProfilerModule;	52	import org.netbeans.modules.profiler.ProfilerModule;
		53	import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher;
53	import org.netbeans.modules.profiler.spi.LoadGenPlugin;	54	import org.netbeans.modules.profiler.spi.LoadGenPlugin;
54	import org.openide.execution.ExecutorTask;	55	import org.openide.execution.ExecutorTask;
55	import org.openide.filesystems.FileObject;	56	import org.openide.filesystems.FileObject;
Lines 72-77 Link Here
72		73
73	doRunTarget(buildScriptFO, target, props);	74	doRunTarget(buildScriptFO, target, props);
74	}	75	}
		76
		77	public void notifyRunTarget(FileObject buildXml, String target) {
		78	getActionSupport().setAll(buildXml, target, null);
		79	}
		80
		81	public void storeProfilingProperties(Properties props) {
		82	getActionSupport().setProperties(props);
		83	}
75		84
76	/**	85	/**
77	* Runs an target in Ant script with properties context.	86	* Runs an target in Ant script with properties context.
Lines 114-132 Link Here
114	@Override	123	@Override
115	public boolean rerunAvailable() {	124	public boolean rerunAvailable() {
116	int state = getProfilingState();	125	int state = getProfilingState();
117	return (state == Profiler.PROFILING_INACTIVE \|\| state == Profiler.PROFILING_STOPPED) ? getActionSupport().isActionAvailable() : false;	126	return (state == Profiler.PROFILING_INACTIVE \|\| state == Profiler.PROFILING_STOPPED) ? ProfilerLauncher.canRelaunch() : false;
118	}	127	}
119		128
120	@Override	129	@Override
121	public boolean modifyAvailable() {	130	public boolean modifyAvailable() {
122	return getProfilingMode()==MODE_ATTACH \|\| getActionSupport().isActionAvailable();	131	return getProfilingState() == Profiler.PROFILING_RUNNING;
123	}	132	}
124		133
125	@Override	134	@Override
126	public void rerunLastProfiling() {	135	public void rerunLastProfiling() {
127	String target = getActionSupport().getTarget();	136	ProfilerLauncher.Session s = ProfilerLauncher.getLastSession();
128	if (target!=null) {	137	if (s != null) {
129	doRunTarget(getActionSupport().getScript(), target, getActionSupport().getProperties());	138	s.run();
130	}	139	}
131	}	140	}
132		141

Lines 82-87 Link Here

(-)a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/ProfilerControlPanel2Support.java (+6 lines)
82	this.properties = properties;	82	this.properties = properties;
83	registerListener();	83	registerListener();
84	}	84	}
		85
		86	void setProperties(Properties p) {
		87	if (this.script != null) {
		88	this.properties = p;
		89	}
		90	}
85		91
86	FileObject getScript() {	92	FileObject getScript() {
87	return script;	93	return script;




/*
 * 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.

 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * 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

 * 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.nbimpl.actions;

import javax.swing.Action;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.lib.profiler.ProfilerLogger;
import org.netbeans.lib.profiler.common.Profiler;
import org.netbeans.lib.profiler.common.ProfilingSettings;
import org.netbeans.lib.profiler.common.SessionSettings;
import org.netbeans.lib.profiler.global.CommonConstants;
import org.netbeans.lib.profiler.utils.MiscUtils;
import org.netbeans.modules.profiler.NetBeansProfiler;

import org.netbeans.modules.profiler.api.icons.Icons;
import org.netbeans.modules.profiler.api.icons.ProfilerIcons;
import org.netbeans.modules.profiler.api.project.ProjectProfilingSupport;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.ui.support.FileSensitiveActions;
import org.netbeans.spi.project.ui.support.MainProjectSensitiveActions;
import org.netbeans.spi.project.ui.support.ProjectActionPerformer;
import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionReferences;
import org.openide.awt.ActionRegistration;
import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.Properties;
import javax.swing.Action;
import org.netbeans.api.java.source.ui.ScanDialog;
import org.netbeans.lib.profiler.common.CommonUtils;
import org.netbeans.lib.profiler.global.Platform;
import org.netbeans.modules.profiler.HeapDumpWatch;
import org.netbeans.modules.profiler.actions.JavaPlatformSelector;
import org.netbeans.modules.profiler.actions.ProfilingSupport;
import org.netbeans.modules.profiler.api.icons.Icons;
import org.netbeans.modules.profiler.api.JavaPlatform;
import org.netbeans.modules.profiler.api.java.JavaProfilerSource;
import org.netbeans.modules.profiler.api.ProfilerDialogs;
import org.netbeans.modules.profiler.api.icons.ProfilerIcons;
import org.netbeans.modules.profiler.api.project.ProjectStorage;
import org.netbeans.modules.profiler.api.project.AntProjectSupport;
import org.netbeans.modules.profiler.api.project.ProjectProfilingSupport;
import org.netbeans.modules.profiler.projectsupport.utilities.ProjectUtilities;


/**
 * 4.0 Ant-style actions
 *
 * @author Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
 * @author Ian Formanek
 */
public class AntActions {
    @ActionID(category="Profile", id="org.netbeans.modules.profiler.actions.ProfileMainProject")
    @ActionRegistration(displayName="Profile Main Project", lazy=false)
    @ActionReferences({
        @ActionReference(path="Menu/Profile", position=100),
        @ActionReference(path="Shortcuts", name="A-F2")
    })
    public static Action profileMainProjectAction() {
        final Action delegate = MainProjectSensitiveActions.mainProjectSensitiveAction(
                new ProjectSensitivePerformer(ActionProvider.COMMAND_PROFILE), 
                NbBundle.getMessage(AntActions.class, "LBL_ProfileMainProjectAction"), // NOI18N
                Icons.getIcon(ProfilerIcons.PROFILE)
        );
        delegate.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(AntActions.class, "HINT_ProfileMainProjectAction")); // NOI18N
        
        return delegate;

    /** Default constructor to avoid creating instances */
    private AntActions() {
    }
    
    @ActionID(category="Profile", id="org.netbeans.modules.profiler.actions.ProfileProjectPopup")
    @ActionRegistration(displayName="Profile", lazy=false, asynchronous=true)
    @ActionReferences({
        @ActionReference(path="Projects/org-netbeans-modules-java-j2seproject/Actions", position=1000),
        @ActionReference(path="Projects/org-netbeans-modules-apisupport-project/Actions", position=900),
        @ActionReference(path="Projects/org-netbeans-modules-apisupport-project-suite/Actions", position=1000),
        @ActionReference(path="Projects/org-netbeans-modules-web-project/Actions", position=1000)
    })
    public static Action profileProjectPopup() {
        Action delegate = ProjectSensitiveActions.projectSensitiveAction(
                new ProjectSensitivePerformer(ActionProvider.COMMAND_PROFILE), 
                NbBundle.getMessage(AntActions.class, "LBL_ProfileProject"), // NOI18N
                null
        );
        
        return delegate;
    }
    
    @ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.ProfileOsgi")
    @ActionRegistration(displayName="#SUITE_ACTION_profile_osgi", asynchronous=true)
    @ActionReference(path="Projects/org-netbeans-modules-apisupport-project-suite-osgi/Actions", position=500)
    @NbBundle.Messages("SUITE_ACTION_profile_osgi=Profile in Felix")
    public static Action profileOsgi() {
        Action delegate = ProjectSensitiveActions.projectSensitiveAction(
                new ProjectSensitivePerformer("profile-osgi"), 
                Bundle.SUITE_ACTION_profile_osgi(), 
                null
        );
        
        return delegate;
    }
    
    @Messages("LBL_ProfileFile=Profile File")
    @ActionID(category="Profile", id="org.netbeans.modules.profiler.actions.ProfileSingle")
    @ActionRegistration(displayName="#LBL_ProfileFile", lazy=false)
    @ActionReferences({
        @ActionReference(path="Loaders/text/x-java/Actions", position=1200),
        @ActionReference(path="Loaders/text/x-jsp/Actions", position=800),
        @ActionReference(path="Menu/Profile", position=110)
    })
    public static Action profileSingle() {
        Action delegate = FileSensitiveActions.fileSensitiveAction(
                new FileSensitivePerformer(ActionProvider.COMMAND_PROFILE_SINGLE),  
                Bundle.LBL_ProfileFile(),
                null);
        
        return delegate;
    }
        
    @Messages("LBL_ProfileTest=Profile Test File")
    @ActionID(category = "Profile", id = "org.netbeans.modules.profiler.actions.ProfileTest")
    @ActionRegistration(displayName = "#LBL_ProfileTest", lazy=false)
    @ActionReferences(value = {
        @ActionReference(path = "Loaders/text/x-java/Actions", position = 1280),
        @ActionReference(path = "Menu/Profile", position = 120)})
    public static Action profileTest() {
        return FileSensitiveActions.fileSensitiveAction(
                new FileSensitivePerformer(ActionProvider.COMMAND_PROFILE_TEST_SINGLE), 
                Bundle.LBL_ProfileTest(),
                null);
    }
    
    @ActionID(id = "org.netbeans.modules.profiler.nbimpl.actions.UnintegrateProfilerAction", category = "Profile")
    @ActionRegistration(displayName = "#LBL_UnintegrateProfilerAction", lazy=false)
    @ActionReference(path = "Menu/Profile/Advanced", position = 500)
    public static Action unintegrateProfiler() {
        final Action a = ProjectSensitiveActions.projectSensitiveAction(new ProjectActionPerformer() {
            @Override
            public boolean enable(Project project) {
                if (!NetBeansProfiler.isInitialized()) {
                    return false;
                }

                if (project == null) {
                    return false;
                        doProfileProject(project, null, NbBundle.getMessage(AntActions.class, "LBL_ProfileProject"));
                    } else {
                        ProfilerDialogs.displayError(Bundle.AntActions_UnsupportedProjectTypeMsg());
                    }
                }
            }, NbBundle.getMessage(AntActions.class, "LBL_ProfileMainProjectAction"), // NOI18N
                                                                                null);
        a.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(AntActions.class, "HINT_ProfileMainProjectAction" // NOI18N
        ));
        a.putValue("iconBase", Icons.getResource(ProfilerIcons.PROFILE));
        a.putValue(Action.SMALL_ICON, Icons.getIcon(ProfilerIcons.PROFILE));

        return a;
    }

    /**
     * @return An Action to invoke profiling of a selected project in the IDE
     */
    public static Action profileProject() {
        final Action a = ProjectSensitiveAction.projectSensitiveAction(new ProjectSensitiveAction.ProfilerProjectActionPerformer() {
                public boolean enable(final Project project, final Lookup context, final boolean lightweightOnly) {
                    if (!NetBeansProfiler.isInitialized()) {
                        return false;
                    }

                    if (project == null) {
                        return false;
                    }

                    return org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities.isProjectTypeSupported(project);
                }

                ProjectProfilingSupport support = ProjectProfilingSupport.get(project);
                return support.supportsUnintegrate();
            }

            @Override
            public void perform(Project project) {
                ProjectProfilingSupport support = ProjectProfilingSupport.get(project);
                try {
                    support.unintegrateProfiler();
                } catch (Exception e) {
                    ProfilerLogger.log(e);
                }
            }
        }, NbBundle.getMessage(AntActions.class, "LBL_UnintegrateProfilerAction"), null); // NOI18N
                                                                                           "LBL_ProfileProjectAction40"), // NOI18N
                                                                       null);
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N

        return a;
    }

    /**
     * @return An Action to invoke profiling of a selected project in the IDE, does not have project name in display name
     */
    public static Action profileProjectPopup() {
        final Action a = ProjectSensitiveAction.projectSensitiveAction(new ProjectSensitiveAction.ProfilerProjectActionPerformer() {
                public boolean enable(final Project project, final Lookup context, final boolean lightweightOnly) {
                    if (!NetBeansProfiler.isInitialized()) {
                        return false;
                    }

                    if (project == null) {
                        return false;
                    }

                    return org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities.isProjectTypeSupported(project);
                }

                public void perform(final Project project, final Lookup context) {
                    doProfileProject(project, null, NbBundle.getMessage(AntActions.class, "LBL_ProfileProject"));
                }
            }, NbBundle.getMessage(AntActions.class, "LBL_ProfileProjectActionPopup"), // NOI18N
                                                                       NbBundle.getMessage(AntActions.class,
                                                                                           "LBL_ProfileProjectActionPopup"), // NOI18N
                                                                       null);
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N

        return a;
    }

    /**
     * @return An Action to invoke profiling of a single class in the IDE
     */
    public static Action profileSingle() {
        final Action a = FileSensitiveAction.fileSensitiveAction(new ProjectSensitiveAction.ProfilerProjectActionPerformer() {
                public boolean enable(final Project project, final Lookup context, final boolean lightweightOnly) {
                    if (!NetBeansProfiler.isInitialized()) {
                        return false;
                    }

                    if (project == null) {
                        return false;
                    }

                    final FileObject[] fos = ProjectSensitiveAction.ActionsUtil.getFilesFromLookup(context, project);

                    if (fos.length != 1) {
                        return false;
                    }

//                    final ProjectTypeProfiler ptp = org.netbeans.modules.profiler.utils.ProjectUtilities.getProjectTypeProfiler(project);
//                    if (!lightweightOnly) {
//                        if (!ptp.isFileObjectSupported(project, fos[0])) {
//                            return ProjectUtilities.hasAction(project, "profile-single"); //NOI18N
//                        }
//                    } else {
//                        return ptp.isProfilingSupported(project) || ProjectUtilities.hasAction(project, "profile-single"); //NOI18N
//                    }
                    ProjectProfilingSupport support = ProjectProfilingSupport.get(project);
                    if (!lightweightOnly) {
                        if (!support.isFileObjectSupported(fos[0])) {
                            return ProjectUtilities.hasAction(project, "profile-single"); //NOI18N
                        }
                    } else {
                        return support.isProfilingSupported() || ProjectUtilities.hasAction(project, "profile-single"); //NOI18N
                    }
                    
                    return true;
                }

                public void perform(final Project project, final Lookup context) {
                    final FileObject[] fos = ProjectSensitiveAction.ActionsUtil.getFilesFromLookup(context, project);

                    if (fos.length != 1) {
                        throw new IllegalStateException();
                    }

                    doProfileProject(project, JavaProfilerSource.createFrom(fos[0]), NbBundle.getMessage(AntActions.class, "LBL_ProfileFile"));
                }
            }, NbBundle.getMessage(AntActions.class, "LBL_ProfileSingleAction40_General"), // NOI18N
                                                                 NbBundle.getMessage(AntActions.class, "LBL_ProfileSingleAction40"), // NOI18N
                                                                 null);
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N

        return a;
    }

    /**
     * @return An Action to invoke profiling of a single class in the IDE. Does not have file name in its display name
     */
    public static Action profileSinglePopup() {
        final Action a = FileSensitiveAction.fileSensitiveAction(new ProjectSensitiveAction.ProfilerProjectActionPerformer() {
                public boolean enable(final Project project, final Lookup context, final boolean lightweightOnly) {
                    if (!NetBeansProfiler.isInitialized()) {
                        return false;
                    }

                    if (project == null) {
                        return false;
                    }

                    final FileObject[] fos = ProjectSensitiveAction.ActionsUtil.getFilesFromLookup(context, project);

                    if (fos.length != 1) {
                        return false;
                    }

//                    final ProjectTypeProfiler ptp = org.netbeans.modules.profiler.utils.ProjectUtilities.getProjectTypeProfiler(project);
//                    if (!lightweightOnly) {
//                        if (!ptp.isFileObjectSupported(project, fos[0])) {
//                            return ProjectUtilities.hasAction(project, "profile-single"); //NOI18N
//                        }
//                    } else {
//                        return ptp.isProfilingSupported(project) || ProjectUtilities.hasAction(project, "profile-single"); //NOI18N
//                    }
                    ProjectProfilingSupport support = ProjectProfilingSupport.get(project);
                    if (!lightweightOnly) {
                        if (!support.isFileObjectSupported( fos[0])) {
                            return ProjectUtilities.hasAction(project, "profile-single"); //NOI18N
                        }
                    } else {
                        return support.isProfilingSupported() || ProjectUtilities.hasAction(project, "profile-single"); //NOI18N
                    }

                    return true;
                }

                public void perform(final Project project, final Lookup context) {
                    final FileObject[] fos = ProjectSensitiveAction.ActionsUtil.getFilesFromLookup(context, project);

                    if (fos.length != 1) {
                        throw new IllegalStateException();
                    }

//                    final ProjectTypeProfiler ptp = org.netbeans.modules.profiler.utils.ProjectUtilities.getProjectTypeProfiler(project);
//                    if (!ptp.isFileObjectSupported(project, fos[0]) && !ProjectUtilities.hasAction(project, "profile-single")) { //NOI18N
//                        throw new IllegalStateException();
//                    }
                    ProjectProfilingSupport support = ProjectProfilingSupport.get(project);
                    if (!support.isFileObjectSupported( fos[0]) && !ProjectUtilities.hasAction(project, "profile-single")) { //NOI18N
                        throw new IllegalStateException();
                    }

                    doProfileProject(project, JavaProfilerSource.createFrom(fos[0]) ,NbBundle.getMessage(AntActions.class, "LBL_ProfileFile"));
                }
            }, NbBundle.getMessage(AntActions.class, "LBL_ProfileSingleActionPopup"), // NOI18N
                                                                 NbBundle.getMessage(AntActions.class,
                                                                                     "LBL_ProfileSingleActionPopup"), // NOI18N
                                                                 null);
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N

        return a;
    }

    /**
     * @return An Action to invoke profiling of a single class in the IDE
     */
    public static Action profileTest() {
        final Action a = FileSensitiveAction.fileSensitiveAction(new ProjectSensitiveAction.ProfilerProjectActionPerformer() {
                public boolean enable(final Project project, final Lookup context, final boolean lightweightOnly) {
                    if (!NetBeansProfiler.isInitialized()) {
                        return false;
                    }

                    if (project == null) {
                        return false;
                    }

                    final FileObject[] fos = ProjectSensitiveAction.ActionsUtil.getFilesFromLookup(context, project);

                    if (fos.length != 1) {
                        return false;
                    }

                    final FileObject fo = ProjectUtilities.findTestForFile(fos[0]);

                    if (fo == null) {
                        return false; // not a test and test for it does not exist
                    }

//                    final ProjectTypeProfiler ptp = org.netbeans.modules.profiler.utils.ProjectUtilities.getProjectTypeProfiler(project);
//                    if (!lightweightOnly) {
//                        return (ptp.isFileObjectSupported(project, fo));
//                    } else {
//                        return ptp.isProfilingSupported(project);
//                    }
                    ProjectProfilingSupport support = ProjectProfilingSupport.get(project);
                    if (!lightweightOnly) {
                        return (support.isFileObjectSupported(fo));
                    } else {
                        return support.isProfilingSupported();
                    }
                }

                public void perform(final Project project, final Lookup context) {
                    final FileObject[] fos = ProjectSensitiveAction.ActionsUtil.getFilesFromLookup(context, project);

                    if (fos.length != 1) {
                        throw new IllegalStateException();
                    }

                    final FileObject fo = ProjectUtilities.findTestForFile(fos[0]);

                    if (fo == null) {
                        throw new IllegalStateException(Bundle.AntActions_FileTestNotFoundMsg());
                    }

                    if (!ProjectProfilingSupport.get(project).isFileObjectSupported(fo)) {
                        throw new IllegalStateException();
                    }

                    doProfileProject(project, JavaProfilerSource.createFrom(fo), NbBundle.getMessage(AntActions.class, "LBL_ProfileTest"));
                }
            }, NbBundle.getMessage(AntActions.class, "LBL_ProfileTestAction_General"), // NI18N
                                                                 NbBundle.getMessage(AntActions.class, "LBL_ProfileTestAction"), // NOI18N
                                                                 null);
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N

        return a;
    }

    public static Action unintegrateProfiler() {
        final Action a = ProjectSensitiveAction.projectSensitiveAction(new ProjectSensitiveAction.ProfilerProjectActionPerformer() {
                public boolean enable(final Project project, final Lookup context, final boolean lightweightOnly) {
                    if (!NetBeansProfiler.isInitialized()) {
                        return false;
                    }

                    if (project == null) {
                        return false;
                    }

//                    final ProjectTypeProfiler ptp = org.netbeans.modules.profiler.utils.ProjectUtilities.getProjectTypeProfiler(project);
//
//                    return ptp.supportsUnintegrate(project);
                    ProjectProfilingSupport support = ProjectProfilingSupport.get(project);
                    return support.supportsUnintegrate();
                }

                public void perform(final Project project, final Lookup context) {
//                    final ProjectTypeProfiler ptp = org.netbeans.modules.profiler.utils.ProjectUtilities.getProjectTypeProfiler(project);
                    ProjectProfilingSupport support = ProjectProfilingSupport.get(project);
                    try {
                        support.unintegrateProfiler();
                    } catch (Exception e) {
                        ProfilerLogger.log(e);
                    }
                }
            }, NbBundle.getMessage(AntActions.class, "LBL_UnintegrateProfilerAction"), // NOI18N
                                                                       NbBundle.getMessage(AntActions.class,
                                                                                           "LBL_UnintegrateProfilerAction"), // NOI18N
                                                                       null);
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N

        return a;
    }

    private static String getHeapDumpPath(ProfilerIDESettings gps, Project project) {
        int oomeDetectionMode = gps.getOOMDetectionMode();

        switch (oomeDetectionMode) {
            case ProfilerIDESettings.OOME_DETECTION_TEMPDIR:
                return System.getProperty("java.io.tmpdir"); // NOI18N
            case ProfilerIDESettings.OOME_DETECTION_PROJECTDIR:

                try {
                    return FileUtil.toFile(ProjectStorage.getSettingsFolder(project, true)).getAbsolutePath();
                } catch (IOException e) {
                    ErrorManager.getDefault().annotate(e, "Cannot resolve project settings directory:\n" + e.getMessage());
                    ErrorManager.getDefault().notify(ErrorManager.ERROR, e);

                    return null;
                }
            case ProfilerIDESettings.OOME_DETECTION_CUSTOMDIR:
                return gps.getCustomHeapdumpPath();
        }

        return null;
    }

    private static void activateLinuxPosixThreadTime(ProfilingSettings ps, Properties props, Project project) {
        if (ps.getThreadCPUTimerOn()) {
            props.setProperty("profiler.info.jvmargs", LINUX_THREAD_TIMER_KEY + " " + props.getProperty("profiler.info.jvmargs")); // NOI18N
            ProfilerLogger.log("Profiler.UseLinuxPosixThreadCPUClocks: Enabled"); // NOI18N
        }
    }

    private static void activateOOMProtection(ProfilerIDESettings gps, Properties props, Project project) {
        if (gps.isOOMDetectionEnabled()) {
            String oldArgs = props.getProperty("profiler.info.jvmargs");
            oldArgs = (oldArgs != null) ? oldArgs : "";

            StringBuilder oomArgsBuffer = new StringBuilder(oldArgs);
            String heapDumpPath = getHeapDumpPath(gps, project);

            if ((heapDumpPath != null) && (heapDumpPath.length() > 0)) {
                // used for filesystem listener
                props.setProperty(HeapDumpWatch.OOME_PROTECTION_ENABLED_KEY, "yes");
                props.setProperty(HeapDumpWatch.OOME_PROTECTION_DUMPPATH_KEY, heapDumpPath);

                // used as an argument for starting java process
                if (heapDumpPath.contains(" ")) {
                    heapDumpPath = "\"" + heapDumpPath + "\"";
                }

                oomArgsBuffer.append(" -XX:+HeapDumpOnOutOfMemoryError"); // NOI18N
                oomArgsBuffer.append(" -XX:HeapDumpPath=").append(heapDumpPath).append(" "); // NOI18N

                ProfilerLogger.log("Profiler.OutOfMemoryDetection: Enabled"); // NOI18N
            }

            props.setProperty("profiler.info.jvmargs", oomArgsBuffer.toString()); // NOI18N
        }
    }

    // -- Private implementation -----------------------------------------------------------------------------------------

    /**
     * Performs profiling of the selected project using either the supplied class (in case of profile single) or the
     * project's main class.
     *
     * @param project           The project to profile
     * @param profiledClassFile In case profiledClass is not null, this is the FileObject representing the specified class
     */
    private static void doProfileProject(final Project project, final JavaProfilerSource profiledClassFile, final String actionName) {
        final boolean isTest = profiledClassFile != null ? profiledClassFile.isTest() : false;
        final FileObject fo = profiledClassFile != null ? profiledClassFile.getFile() : null;
        
        if (ProfilingSupport.getDefault().isProfilingActionInvoked()) {
            return;
        }

        ProfilingSupport.getDefault().setProfilingActionInvoked(true);

        final Runnable actionPerform = new Runnable() {
            public void run() {
                try {
                    // 1. if there is profiling in progress, ask the user and possibly cancel
                    if (ProfilingSupport.getDefault().checkProfilingInProgress()) {
                        return;
                    }

//                        final ProjectTypeProfiler ptp = org.netbeans.modules.profiler.utils.ProjectUtilities.getProjectTypeProfiler(project);
                    ProjectProfilingSupport support = ProjectProfilingSupport.get(project);
                    if (!support.isProfilingSupported()) {
                        // Branch A: not supported project with profile action in the action provider

                        // as of now, the profile-tests will neve be used
                        ProjectUtilities.invokeAction(project, isTest ? "profile-tests" : "profile"); //NOI18N
                    } else {
                        // Branch B: project profiling directly supported via ProjectTypeProfiler
                        // 2. check if the project has been modified for profiling
                        if (!support.checkProjectIsModifiedForProfiler()) {
                            return; // something failed - has already been reported to the user
                        }

                        // 3. determine Java platform to use
                        final JavaPlatform platform = initPlatform(project, support);

                        if (platform == null) {
                            return; // user already notified
                        }

                        // 3. check if the project is properly setup to be profiled (e.g. main class has a main method)
                        // FIXME - probably it would be better to pass around JavaProfilerSource instead of FileObject
                        if (!support.checkProjectCanBeProfiled(fo)) {
                            return;
                        }

                        // 5. get session settings from the project context
                        final ProfilerIDESettings gps = ProfilerIDESettings.getInstance();

                        final String javaFile = platform.getPlatformJavaFile();

                        if (javaFile == null) {
                            if (ProfilerIDESettings.getInstance().getJavaPlatformForProfiling() == null) {
                                // used platform defined for project
                                ProfilerDialogs.displayError(Bundle.AntActions_InvalidPlatformProjectMsg(platform.getDisplayName()));
                            } else {
                                // used platform defined in Options / Profiler
                                ProfilerDialogs.displayError(Bundle.AntActions_InvalidPlatformProfilerMsg(platform.getDisplayName()));
                            }
                            return;
                        }

                        final String javaVersion = platform.getPlatformJDKVersion();

                        if (javaVersion == null) {
                            ProfilerDialogs.displayError(Bundle.AntActions_FailedDetermineJavaPlatformMsg(platform.getDisplayName()));

                            return;
                        }

                        final SessionSettings ss = new SessionSettings();
                        ss.setJavaExecutable(javaFile);
                        ss.setJavaVersionString(javaVersion);
                        ss.setSystemArchitecture(platform.getPlatformArchitecture());
                        ss.setPortNo(gps.getPortNo());
                        support.setupProjectSessionSettings(ss);

                        boolean settingsAccepted = false;
                        ProfilingSettings pSettings = null;

                        while (!settingsAccepted) {
                            // 6. show SelectTaskPanel and let the user choose the profiling type
                            pSettings = ProfilingSupport.getDefault()
                                                        .selectTaskForProfiling(project, ss, fo,
                                                                                support.supportsSettingsOverride());

                            if (pSettings == null) {
                                return; // cancelled
                            }

                            // Here was a check for enormous profiling overhead when profiling Web Projects.
                            // Generally, this is the right place to give ProjectTypeProfiler a chance to
                            // accept/reject current profiling settings before starting new profiling session.
                            settingsAccepted = true;
                        }

                        final ProfilingSettings profilingSettings = pSettings;
                        final Properties props = new Properties();

                        // 7. store things into properties to be passed to Ant
                        profilingSettings.store(props); // Profiling settings
                        ss.store(props); // Session settings

                        // Auxiliary internal profiler information:
                        String projectDir = FileUtil.toFile(project.getProjectDirectory()).getAbsolutePath();
                        props.setProperty("profiler.info.project.dir", projectDir); // NOI18N // TODO: create constant

                        if (fo != null) {
                            String singleFile = FileUtil.toFile(fo).getAbsolutePath();
                            props.setProperty("profiler.info.single.file", singleFile); // NOI18N // TODO: create constant
                        }

                        String usedJavaExecutable = ss.getJavaExecutable();
                        String usedJvmArgs = ss.getJVMArgs();

                        if (profilingSettings.getOverrideGlobalSettings()) {
                            String javaPlatformName = profilingSettings.getJavaPlatformName();
                            JavaPlatform jp;

                            if (javaPlatformName != null) {
                                usedJavaExecutable = Profiler.getDefault().getPlatformJavaFile(javaPlatformName);
                                jp = JavaPlatform.getJavaPlatformById(javaPlatformName);

                                if (jp == null) {
                                    // selected platform does not exist, use 
                                    String text = Bundle.AntActions_InvalidJavaplatformMsg(javaPlatformName);
                                    ProfilerDialogs.displayWarning(text);
                                    jp = platform;
                                }
                            } else { 
                                // javaPlatformName == null -> do not override java platform, use platform from global settings
                                jp = platform;
                            }
                            // added to support nbstartprofiledserver
                            props.setProperty("profiler.info.javaPlatform",
                                              jp.getPlatformId());
                            usedJvmArgs = profilingSettings.getJVMArgs();
                        } else {
                            // added to support nbstartprofiledserver
                            props.setProperty("profiler.info.javaPlatform",
                                              platform.getPlatformId());
                        }

                        props.setProperty("profiler.info.jvm", usedJavaExecutable); // NOI18N
                        props.setProperty("profiler.info.jvmargs", usedJvmArgs); // NOI18N

                        if (javaVersion.equals(CommonConstants.JDK_15_STRING)) {
                            // JDK 1.5 used
                            props.setProperty("profiler.info.jvmargs.agent", // NOI18N
                                              IDEUtils.getAntProfilerStartArgument15(ss.getPortNo(),
                                                                                     ss.getSystemArchitecture())
                            );

                            if (platform.getPlatformJDKMinor() >= 7) {
                                activateOOMProtection(gps, props, project);
                            } else {
                                ProfilerLogger.log("Profiler.OutOfMemoryDetection: Disabled. Not supported JVM. Use at least 1.4.2_12 or 1.5.0_07"); // NOI18N
                            }
                        } else if (javaVersion.equals(CommonConstants.JDK_16_STRING)) {
                            // JDK 1.6 used
                            props.setProperty("profiler.info.jvmargs.agent", // NOI18N
                                              IDEUtils.getAntProfilerStartArgument16(ss.getPortNo(),
                                                                                     ss.getSystemArchitecture())
                            );
                            activateOOMProtection(gps, props, project);
                        } else if (javaVersion.equals(CommonConstants.JDK_17_STRING)) {
                            props.setProperty("profiler.info.jvmargs.agent", // NOI18N
                                              IDEUtils.getAntProfilerStartArgument17(ss.getPortNo(),
                                                                                     ss.getSystemArchitecture())
                            );
                            activateOOMProtection(gps, props, project);
                        } else if (javaVersion.equals(CommonConstants.JDK_18_STRING)) {
                            props.setProperty("profiler.info.jvmargs.agent", // NOI18N
                                              IDEUtils.getAntProfilerStartArgument18(ss.getPortNo(),
                                                                                     ss.getSystemArchitecture())
                            );
                            activateOOMProtection(gps, props, project);
                        } else {
                            throw new IllegalArgumentException("Unsupported JDK " + javaVersion); // NOI18N
                        }

                        if (Platform.isLinux() && javaVersion.equals(CommonConstants.JDK_16_STRING)) {
                            activateLinuxPosixThreadTime(pSettings, props, project);
                        }

                        if (!support.startProfilingSession(fo, isTest, props)) { // Used for Maven - ProjectTypeProfiler itself controls starting profiling session

                            // 8. determine the build script and target to run
                            AntProjectSupport antSupport = AntProjectSupport.get(project);
                            final FileObject buildScriptFO = antSupport.getProjectBuildScript();

                            if (buildScriptFO == null) {
                                ProfilerDialogs.displayError(Bundle.AntActions_FailedDetermineProjectBuildScriptMsg(ProjectUtils.getInformation(project).getName()));

                                return;
                            }

                            // determine which type fo target shoudl be called, and request its name
                            int type;

                            if (isTest) {
                                type = (fo == null) ? AntProjectSupport.TARGET_PROFILE_TEST
                                                                   : AntProjectSupport.TARGET_PROFILE_TEST_SINGLE;
                            } else {
                                type = (fo == null) ? AntProjectSupport.TARGET_PROFILE
                                                                   : AntProjectSupport.TARGET_PROFILE_SINGLE;
                            }

                            final String profileTarget = antSupport.getProfilerTargetName(buildScriptFO, type, fo);

                            if (profileTarget == null) {
                                return; // already notified the user or user's choice
                            }

                            // 9. final ability of the ProjectTypeProfiler to influence the properties passed to Ant
                            support.configurePropertiesForProfiling(props, fo);

                            // 10. Run the target
                            ((org.netbeans.modules.profiler.nbimpl.NetBeansProfiler)Profiler.getDefault()).runTarget(buildScriptFO, profileTarget, props);

                        }


                    }
                } finally {
                    ProfilingSupport.getDefault().setProfilingActionInvoked(false);
                }
            }
        };
        
        CommonUtils.runInEventDispatchThread(new Runnable() {
            @Override
            public void run() {
                if (ScanDialog.runWhenScanFinished(new Runnable() {
                    @Override
                    public void run() {
                        RequestProcessor.getDefault().post(actionPerform);
                    }
                }, actionName)) {
                    ProfilingSupport.getDefault().setProfilingActionInvoked(false);
                }
            }
        });
    }

    private static JavaPlatform initPlatform(Project project, ProjectProfilingSupport pps) {
        // 1. check if we have a Java platform to use for profiling
        final ProfilerIDESettings gps = ProfilerIDESettings.getInstance();
        JavaPlatform platform = JavaPlatform.getJavaPlatformById(gps.getJavaPlatformForProfiling());
        JavaPlatform projectPlatform = pps.getProjectJavaPlatform();

        if (platform == null) { // should use the one defined in project
            platform = projectPlatform;

            if ((platform == null) || !MiscUtils.isSupportedJVM(platform.getSystemProperties())) {
                platform = JavaPlatformSelector.getDefault().selectPlatformToUse();

                if (platform == null) {
                    return null;
                }
            }
        }

        if (projectPlatform != null) { // check that the project platform is not newer than platform to use

            while (true) {
                if (projectPlatform.getVersion().compareTo(platform.getVersion()) > 0) {
                    Boolean ret = ProfilerDialogs.displayCancellableConfirmation(
                            Bundle.AntActions_IncorrectJavaSpecVersionDialogMsg(),
                            Bundle.AntActions_IncorrectJavaSpecVersionDialogCaption());

                    if (Boolean.TRUE.equals(ret)) {
                        break;
                    } else if (Boolean.FALSE.equals(ret)) {
                        platform = JavaPlatformSelector.getDefault().selectPlatformToUse();

                        if (platform == null) {
                            return null; // cancelled by the user
                        }
                    } else { // cancelled

                        return null;
                    }
                } else {
                    break; // version comparison OK.
                }
            }
        }

        return platform;
    }
    
//    private static boolean isProjectTypeSupported(final Project project) {
//        ProjectTypeProfiler ptp = org.netbeans.modules.profiler.utils.ProjectUtilities.getProjectTypeProfiler(project);
//
//        if (ptp.isProfilingSupported(project)) {
//            return true;
//        }
//
//        return ProjectUtilities.hasAction(project, "profile"); //NOI18N
//    }
}

Lines 67-72 Link Here

(-)a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/Bundle.properties (-3 / +1 lines)
67	LBL_ProfileProjectActionPopup=Profile	67	LBL_ProfileProjectActionPopup=Profile
68	LBL_UnintegrateProfilerAction=&Unintegrate Profiler from {0,choice,0#Project\|1#\"{1}\"\|1<Projects}	68	LBL_UnintegrateProfilerAction=&Unintegrate Profiler from {0,choice,0#Project\|1#\"{1}\"\|1<Projects}
69		69
70	LBL_ProfileProject=Profile Project	70	LBL_ProfileProject=Profile
71	LBL_ProfileFile=Profile File
72	LBL_ProfileTest=Profile Test




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 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]"
 *
 * Contributor(s):
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * 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.
 */

package org.netbeans.modules.profiler.nbimpl.actions;

import org.netbeans.api.project.Project;
import org.openide.filesystems.FileObject;
import org.openide.util.Lookup;
import javax.swing.Action;
import javax.swing.Icon;


/**
 * Action sensitive to current project
 *
 * @author Ian Formanek
 */
public final class FileSensitiveAction extends ProjectSensitiveAction {
    //~ Constructors -------------------------------------------------------------------------------------------------------------

    /**
     * Constructor for global actions. E.g. actions in main menu which
     * listen to the global context.
     */
    private FileSensitiveAction(final ProfilerProjectActionPerformer performer, final String name, final String namePattern,
                                final Icon icon, final Lookup lookup) {
        super(performer, name, namePattern, icon, lookup);
    }

    //~ Methods ------------------------------------------------------------------------------------------------------------------

    public static FileSensitiveAction fileSensitiveAction(final ProfilerProjectActionPerformer performer, final String name,
                                                          final String namePattern, final Icon icon) {
        return new FileSensitiveAction(performer, name, namePattern, icon, null);
    }

    @Override
    public Action createContextAwareInstance(final Lookup actionContext) {
        return new FileSensitiveAction(getPerformer(), getName(), getNamePattern(), (Icon) getValue(SMALL_ICON), actionContext);
    }

    @Override
    protected void doRefresh(final Lookup context) {
        final Project[] projects = ActionsUtil.getProjectsFromLookup(context, null);

        if (projects.length != 1) {
            setDisplayName(ActionsUtil.formatName(getNamePattern(), 0, "")); //NOI18N
            setEnabled(false);
        } else {
            final FileObject[] files = ActionsUtil.getFilesFromLookup(context, projects[0]);

            if ((files != null) && (files.length == 1)) {
                setEnabled(getPerformer().enable(projects[0], context, true));
            } else {
                setEnabled(false);
            }

            setDisplayName(ActionsUtil.formatName(getNamePattern(), files.length, (files.length > 0) ? files[0].getNameExt() : "")); // NOI18N
        }
    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 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 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.profiler.nbimpl.actions;

import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.modules.profiler.api.project.ProjectProfilingSupport;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.ui.support.FileActionPerformer;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;

/**
 *
 * @author Jaroslav Bachorik
 */
public class FileSensitivePerformer implements FileActionPerformer {

    final private String command;

    public FileSensitivePerformer(String command) {
        this.command = command;
    }

    @Override
    public boolean enable(FileObject file) {
        if (file == null) {
            return false;
        }

        Project p = FileOwnerQuery.getOwner(file);

        if (p == null) {
            return false;
        }

        ActionProvider ap = p.getLookup().lookup(ActionProvider.class);
        try {
            if (ap != null && ap.isActionEnabled(command, getContext(file))) {
                ProjectProfilingSupport ppp = ProjectProfilingSupport.get(p);
                if (ppp == null) {
                    return false;
                }
                
                return ppp.isProfilingSupported();
            }
        } catch (IllegalArgumentException e) {
            // command not supported
        }
        return false;
    }

    @Override
    public void perform(FileObject file) {
        Project p = FileOwnerQuery.getOwner(file);
        ActionProvider ap = p.getLookup().lookup(ActionProvider.class);
        if (ap != null) {
            ProfilerLauncher.Session s = ProfilerLauncher.newSession(command, getContext(file));
            if (s != null) {
                s.run();
            }
        }
    }

    private Lookup getContext(FileObject file) {
        Project p = FileOwnerQuery.getOwner(file);
        try {
            return Lookups.fixed(file, p, DataObject.find(file));
        } catch (DataObjectNotFoundException e) {
        }
        return Lookups.fixed(file, p);
    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 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 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.profiler.nbimpl.actions;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.lib.profiler.ProfilerLogger;
import org.netbeans.lib.profiler.common.ProfilingSettings;
import org.netbeans.lib.profiler.common.SessionSettings;
import org.netbeans.lib.profiler.global.CommonConstants;
import org.netbeans.lib.profiler.global.Platform;
import org.netbeans.modules.profiler.HeapDumpWatch;
import org.netbeans.modules.profiler.actions.ProfilingSupport;
import org.netbeans.modules.profiler.api.JavaPlatform;
import org.netbeans.modules.profiler.api.ProfilerDialogs;
import org.netbeans.modules.profiler.api.ProfilerIDESettings;
import org.netbeans.modules.profiler.api.project.ProjectProfilingSupport;
import org.netbeans.modules.profiler.api.project.ProjectStorage;
import org.netbeans.modules.profiler.nbimpl.NetBeansProfiler;
import org.netbeans.modules.profiler.utils.IDEUtils;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;

/**
 *
 * @author Jaroslav Bachorik
 */
public class ProfilerLauncher {
    final private static Logger LOG = Logger.getLogger(ProfilerLauncher.class.getName());
    
    final private static String AGENT_ARGS = "agent.jvmargs"; // NOI18N
    final private static String LINUX_THREAD_TIMER_KEY = "-XX:+UseLinuxPosixThreadCPUClocks"; // NOI18N

    final public static class Session  {
        private SessionSettings ss;
        private ProfilingSettings ps;
        private Map<String, String> props;
        private Launcher launcher;
        private Project project;
        private FileObject fo;
        private JavaPlatform platform;
        private String command;
        private Lookup context;
        final private Map<String, Object> customProps = new HashMap<String, Object>();
        
        private boolean configured = false;
        private boolean rerun;

        public static Session createSession(String command, Lookup context) {
            Session s = new Session(command, context);
            config(s);
            lastSession = s;
            
            return s;
        }
        
        public static Session createSession(Project p) {
            Session s = new Session(p);
            config(s);
            return s;
        }
        
        private Session(Project p) {
            this.props = new HashMap<String, String>();
            this.launcher = null;
            this.project = p;
        }
        
        private Session(String command, Lookup context) {
            assert command != null;
            assert context != null;
            
            this.project = context.lookup(Project.class);
            this.fo = context.lookup(FileObject.class);
            this.command = command;
            this.props = new HashMap<String, String>();
            this.context = context;
            
            initLauncher();
        }

        public ProfilingSettings getProfilingSettings() {
            return ps;
        }
        
        public SessionSettings getSessionSettings() {
            return ss;
        }
        
        public void setSessionSettings(SessionSettings ss) {
            this.ss = ss;
            this.ss.store(props);
        }
        
        public Map<String, String> getProperties() {
            if (!configured) {
                if (configure()) {
                    return props;
                } else {
                    return null;
                }
            }
            return props;
        }
        
        public Project getProject() {
            return project;
        }
        
        public JavaPlatform getPlatform() {
            return platform;
        }
        
        public Lookup getContext() {
            return context;
        }
        
        public FileObject getFile() {
            return fo;
        }
        
        public String getCommand() {
            return command;
        }
        
        public Object getAttribute(String name) {
            return customProps.get(name);
        }
        
        public void setAttribute(String name, Object value) {
            customProps.put(name, value);
        }
        
        public boolean hasAttribute(String name) {
            return customProps.containsKey(name);
        }
        
        public boolean isConfigured() {
            return configured;
        }
        
        public boolean configure() {
            final ProjectProfilingSupport pSupport = ProjectProfilingSupport.get(project);

            NetBeansProfiler.getDefaultNB().setProfiledProject(project, fo);

            // ** display select task panel
            ProfilingSettings ps = ProfilingSupport.getDefault().selectTaskForProfiling(project, ss, fo, true);;
            if (ps != null) {
                this.ps = ps;
                this.ps.store(props);
                
                setupAgentEnv(platform, ss, ProfilerIDESettings.getInstance(), ps, project, props);
                pSupport.configurePropertiesForProfiling(props, fo);

                rerun = false;
                configured = true;
            }
            return configured;
        }
        
        public void run() {
            if (launcher != null) {
                launcher.launch(rerun);
                rerun = true;
            } else {
                // LOG
            }
        }
        
        private void initLauncher() {
            Project p = null;
            if (project != null) {
                p = project;
                
            } else if (fo != null) {
                p = FileOwnerQuery.getOwner(fo);
            }
            
            if (p != null) {
                LauncherFactory f = p.getLookup().lookup(LauncherFactory.class);
                if (f != null) {
                    launcher = f.createLauncher(this);
                }
            }
        }
    }
    
    public interface Launcher {
        void launch(boolean rerun);
    }
    
    public interface LauncherFactory {
        Launcher createLauncher(Session session);
    }
    
    @ProjectServiceProvider(service=LauncherFactory.class, projectTypes={
        @ProjectType(id="org-netbeans-modules-java-j2seproject"), 
        @ProjectType(id="org-netbeans-modules-ant-freeform"),
        @ProjectType(id="org-netbeans-modules-apisupport-project"),
        @ProjectType(id="org-netbeans-modules-apisupport-project-suite"),
        @ProjectType(id="org-netbeans-modules-j2ee-earproject"),
        @ProjectType(id="org-netbeans-modules-j2ee-ejbjarproject"),
        @ProjectType(id="org-netbeans-modules-web-project")
    })
    final public static class AntLauncherFactory implements LauncherFactory {
        final private Project prj;
        public AntLauncherFactory(Project prj) {
            this.prj = prj;
        }

        @Override
        public Launcher createLauncher(Session session) {
            ActionProvider ap = prj.getLookup().lookup(ActionProvider.class);
            if (ap != null) {
                return new AntLauncher(ap, session.command, session.context);
            }
            
            return null;
        }
    }
    
    final private static class AntLauncher implements Launcher {
        private ActionProvider ap;
        private String command;
        private Lookup context;

        public AntLauncher(ActionProvider ap, String command, Lookup context) {
            this.ap = ap;
            this.command = command;
            this.context = context;
        }

        @Override
        public void launch(boolean rerun) {
            ap.invokeAction(
                command, 
                context
            );
        }
    }
    
    private static Session lastSession;
    
    public static Session newSession(@NonNull final String command, @NonNull final Lookup context) {
        return Session.createSession(command, context);                
    }
    
    public static Session getLastSession() {
        return lastSession;
    }
    
    public static void clearLastSession() {
        lastSession = null;
    }
    
    public static boolean canRelaunch() {
        return lastSession != null;
    }
    
    @NbBundle.Messages({
        "InvalidPlatformProjectMsg=The Java platform defined for the project is invalid. Right-click the project\nand choose a different platform using Properties | Libraries | Java Platform.\n\nInvalid platform: {0}",
        "InvalidPlatformProfilerMsg=The Java platform defined for profiling is invalid. Choose a different platform\nin Tools | Options | Miscellaneous | Profiler | Profiler Java Platform.\n\nInvalid platform: {0}",
        "FailedDetermineJavaPlatformMsg=Failed to determine version of Java platform: {0}"
    })
    private static void config(Session session) {
        Project project = null;
        if (session.project == null) {
            if (session.fo != null) {
                project = FileOwnerQuery.getOwner(session.fo);
            }
        } else {
            project = session.project;
        }
        if (project == null) return; // sanity check; we need project here
        
        if (ProfilingSupport.getDefault().checkProfilingInProgress()) {
            return;
        }
        
        final ProjectProfilingSupport pSupport = ProjectProfilingSupport.get(project);
        if (pSupport == null) {
            return;
        }
        
        final SessionSettings ss = new SessionSettings();
        // *** session settings setup
        pSupport.setupProjectSessionSettings(ss);
        ProfilerIDESettings gps = ProfilerIDESettings.getInstance();

        ss.setPortNo(gps.getPortNo());
        // ***

        // *** java platform recheck
        JavaPlatform platform = pSupport.getProjectJavaPlatform();
        final String javaFile = platform.getPlatformJavaFile();

        if (javaFile == null) {
            if (ProfilerIDESettings.getInstance().getJavaPlatformForProfiling() == null) {
                // used platform defined for project
                ProfilerDialogs.displayError(Bundle.InvalidPlatformProjectMsg(platform.getDisplayName()));
            } else {
                // used platform defined in Options / Profiler
                ProfilerDialogs.displayError(Bundle.InvalidPlatformProfilerMsg(platform.getDisplayName()));
            }
            return;
        }

        final String javaVersion = platform.getPlatformJDKVersion();

        if (javaVersion == null) {
            ProfilerDialogs.displayError(Bundle.FailedDetermineJavaPlatformMsg(platform.getDisplayName()));

            return;
        }
        
        session.ss = ss;
        session.platform = platform;
    }
    
    private static void setupAgentEnv(JavaPlatform platform, SessionSettings ss, ProfilerIDESettings gps, ProfilingSettings pSettings, Project project, Map<String, String> props) {
        String javaVersion = platform.getPlatformJDKVersion();
        if (javaVersion.equals(CommonConstants.JDK_15_STRING)) {
            // JDK 1.5 used
            props.put(
                AGENT_ARGS, 
                IDEUtils.getAntProfilerStartArgument15(ss.getPortNo(), ss.getSystemArchitecture())
            );

            if (platform.getPlatformJDKMinor() >= 7) {
                activateOOMProtection(gps, props, project);
            } else {
                ProfilerLogger.log("Profiler.OutOfMemoryDetection: Disabled. Not supported JVM. Use at least 1.4.2_12 or 1.5.0_07"); // NOI18N
            }
        } else if (javaVersion.equals(CommonConstants.JDK_16_STRING)) {
            // JDK 1.6 used
            props.put(
                AGENT_ARGS,
                IDEUtils.getAntProfilerStartArgument16(ss.getPortNo(), ss.getSystemArchitecture())
            );
            activateOOMProtection(gps, props, project);
        } else if (javaVersion.equals(CommonConstants.JDK_17_STRING)) {
            props.put(
                AGENT_ARGS,
                IDEUtils.getAntProfilerStartArgument17(ss.getPortNo(), ss.getSystemArchitecture())
            );
            activateOOMProtection(gps, props, project);
        } else if (javaVersion.equals(CommonConstants.JDK_18_STRING)) {
            props.put(
                AGENT_ARGS,
                IDEUtils.getAntProfilerStartArgument18(ss.getPortNo(), ss.getSystemArchitecture())
            );
            activateOOMProtection(gps, props, project);
        } else {
            throw new IllegalArgumentException("Unsupported JDK " + javaVersion); // NOI18N
        }

        if (Platform.isLinux() && javaVersion.equals(CommonConstants.JDK_16_STRING)) {
            activateLinuxPosixThreadTime(pSettings, props);
        }
        
        props.put("profiler.java.platform", ss.getJavaExecutable());
        props.put("profiler.info.project.dir", project.getProjectDirectory().getPath());
    }
    
    private static void activateLinuxPosixThreadTime(ProfilingSettings ps, Map<String, String> props) {
        if (ps.getThreadCPUTimerOn()) {
            props.put("profiler.info.jvmargs", LINUX_THREAD_TIMER_KEY + " " + props.get("profiler.info.jvmargs")); // NOI18N
            ProfilerLogger.log("Profiler.UseLinuxPosixThreadCPUClocks: Enabled"); // NOI18N
        }
    }

    private static void activateOOMProtection(ProfilerIDESettings gps, Map<String, String> props, Project project) {
        if (gps.isOOMDetectionEnabled()) {
            String oldArgs = props.get("profiler.info.jvmargs");
            oldArgs = (oldArgs != null) ? oldArgs : "";

            StringBuilder oomArgsBuffer = new StringBuilder(oldArgs);
            String heapDumpPath = getHeapDumpPath(gps, project);

            if ((heapDumpPath != null) && (heapDumpPath.length() > 0)) {
                // used for filesystem listener
                props.put(HeapDumpWatch.OOME_PROTECTION_ENABLED_KEY, "yes");
                props.put(HeapDumpWatch.OOME_PROTECTION_DUMPPATH_KEY, heapDumpPath);

                // used as an argument for starting java process
                if (heapDumpPath.contains(" ")) {
                    heapDumpPath = "\"" + heapDumpPath + "\"";
                }

                oomArgsBuffer.append(" -XX:+HeapDumpOnOutOfMemoryError"); // NOI18N
                oomArgsBuffer.append(" -XX:HeapDumpPath=").append(heapDumpPath).append(" "); // NOI18N

                ProfilerLogger.log("Profiler.OutOfMemoryDetection: Enabled"); // NOI18N
            }

            props.put("profiler.info.jvmargs", oomArgsBuffer.toString()); // NOI18N
        }
    }
    
    private static String getHeapDumpPath(ProfilerIDESettings gps, Project project) {
        int oomeDetectionMode = gps.getOOMDetectionMode();

        switch (oomeDetectionMode) {
            case ProfilerIDESettings.OOME_DETECTION_TEMPDIR:
                return System.getProperty("java.io.tmpdir"); // NOI18N
            case ProfilerIDESettings.OOME_DETECTION_PROJECTDIR:

                try {
                    return FileUtil.toFile(ProjectStorage.getSettingsFolder(project, true)).getAbsolutePath();
                } catch (IOException e) {
                    LOG.log(Level.WARNING, "Cannot resolve project settings directory:\n" + e.getMessage(), e);
                    
                    return null;
                }
            case ProfilerIDESettings.OOME_DETECTION_CUSTOMDIR:
                return gps.getCustomHeapdumpPath();
        }

        return null;
    }
}

Lines 72-78 Link Here

(-)a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerToolbarDropdownAction.java (-1 / +1 lines)
72	//~ Constructors -------------------------------------------------------------------------------------------------------------	72	//~ Constructors -------------------------------------------------------------------------------------------------------------
73		73
74	public ProfilerToolbarDropdownAction() {	74	public ProfilerToolbarDropdownAction() {
75	defaultAction = AntActions.profileMainProject();	75	defaultAction = AntActions.profileMainProjectAction();
76	}	76	}
77		77
78	//~ Methods ------------------------------------------------------------------------------------------------------------------	78	//~ Methods ------------------------------------------------------------------------------------------------------------------




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 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]"
 *
 * Contributor(s):
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * 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.
 */

package org.netbeans.modules.profiler.nbimpl.actions;

import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.profiler.ui.NBSwingWorker;
import org.netbeans.modules.profiler.ui.ProfilerProgressDisplayer;
import org.netbeans.modules.profiler.utilities.OutputParameter;
import org.netbeans.spi.project.ActionProvider;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.util.*;
import java.awt.event.ActionEvent;
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.Icon;
import org.netbeans.modules.profiler.api.ProfilerDialogs;
import org.netbeans.lib.profiler.common.CommonUtils;
import org.netbeans.modules.profiler.api.ProgressDisplayer;


/**
 * Action sensitive to current project
 *
 * @author Ian Formanek
 */
public class ProjectSensitiveAction extends AbstractAction implements ContextAwareAction, LookupListener {
    //~ Inner Interfaces ---------------------------------------------------------------------------------------------------------

    public interface ProfilerProjectActionPerformer {
        //~ Methods --------------------------------------------------------------------------------------------------------------

        /**
         * Called when the context of the action changes and the action should
         * be enabled or disabled within the new context, according to the newly
         * selected project.
         *
         * @param project the currently selected project, or null if no project is selected
         * @return true to enable the action, false to disable it
         */
        public boolean enable(Project project, Lookup context, boolean lightweightOnly);

        /**
         * Called when the user invokes the action.
         *
         * @param project the project this action was invoked for (XXX can this be null or not?)
         * @throws IllegalStateException when trying to perform the action in an illegal context
         */
        public void perform(Project project, Lookup context);
    }

    //~ Inner Classes ------------------------------------------------------------------------------------------------------------

    public static final class ActionsUtil {
        //~ Methods --------------------------------------------------------------------------------------------------------------

        /**
         * In given lookup will find all FileObjects owned by given project
         * with given command supported.
         */
        public static FileObject[] getFilesFromLookup(final Lookup lookup, final Project project) {
            final HashSet result = new HashSet();
            final Collection dataObjects = lookup.lookup(new Lookup.Template(DataObject.class)).allInstances();

            for (Iterator it = dataObjects.iterator(); it.hasNext();) {
                final DataObject dObj = (DataObject) it.next();
                final FileObject fObj = dObj.getPrimaryFile();
                final Project p = FileOwnerQuery.getOwner(fObj);

                if ((p != null) && p.equals(project)) {
                    result.add(fObj);
                }
            }

            final FileObject[] fos = new FileObject[result.size()];
            result.toArray(fos);

            return fos;
        }

        /**
         * Finds all projects in given lookup. If the command is not null it will check
         * whether given command is enabled on all projects. If and only if all projects
         * have the command supported it will return array including the project. If there
         * is one project with the command disabled it will return empty array.
         */
        public static Project[] getProjectsFromLookup(final Lookup lookup, final String command) {
            final Set result = new HashSet();

            // First find out whether there is a project directly in the Lookup
            final Collection projects = lookup.lookup(new Lookup.Template(Project.class)).allInstances();

            for (Iterator it = projects.iterator(); it.hasNext();) {
                final Project p = (Project) it.next();
                result.add(p);
            }

            // Now try to guess the project from dataobjects
            final Collection dataObjects = lookup.lookup(new Lookup.Template(DataObject.class)).allInstances();

            for (Iterator it = dataObjects.iterator(); it.hasNext();) {
                final DataObject dObj = (DataObject) it.next();
                final FileObject fObj = dObj.getPrimaryFile();
                final Project p = FileOwnerQuery.getOwner(fObj);

                if (p != null) {
                    result.add(p);
                }
            }

            final Project[] projectsArray = new Project[result.size()];
            result.toArray(projectsArray);

            if (command != null) {
                // All projects have to have the command enabled
                for (int i = 0; i < projectsArray.length; i++) {
                    if (!commandSupported(projectsArray[i], command, lookup)) {
                        return new Project[0];
                    }
                }
            }

            return projectsArray;
        }

        /**
         * Tests whether given command is available on the project and whether
         * the action as to be enabled in current Context
         *
         * @param project Project to test
         * @param command Command for test
         * @param context Lookup representing current context or null if context
         *                does not matter.
         */
        public static boolean commandSupported(final Project project, final String command, final Lookup context) {
            //We have to look whether the command is supported by the project
            final ActionProvider ap = (ActionProvider) project.getLookup().lookup(ActionProvider.class);

            if (ap != null) {
                final List commands = Arrays.asList(ap.getSupportedActions());

                if (commands.contains(command)) {
                    if ((context == null) || ap.isActionEnabled(command, context)) {
                        return true;
                    }
                }
            }

            return false;
        }

        /**
         * Good for formating names of actions with some two parameter pattern
         * {0} nuber of objects (e.g. Projects or files ) and {1} name of one
         * or first object (e.g. Project or file) or null if the number is == 0
         */
        public static String formatName(final String namePattern, final int numberOfObjects, final String firstObjectName) {
            return MessageFormat.format(namePattern,
                                        new Object[] {
                                            Integer.valueOf(numberOfObjects), (firstObjectName == null) ? "" : firstObjectName, //NOI18N
                                        });
        }

        public static String formatProjectSensitiveName(final String namePattern, final Project[] projects) {
            // Set the action's name
            if ((projects == null) || (projects.length == 0)) {
                // No project selected
                return ActionsUtil.formatName(namePattern, 0, null);
            } else {
                // Some project selected
                return ActionsUtil.formatName(namePattern, projects.length,
                                              ProjectUtils.getInformation(projects[0]).getDisplayName());
            }
        }
    }

    //~ Instance fields ----------------------------------------------------------------------------------------------------------

    protected volatile boolean actionEnabled = false;
    private final Lookup lookup;
    private final Object initLock = new Object();
    private final Object refreshRequestLock = new Object();
    private final ProfilerProjectActionPerformer performer;
    private final String namePattern;
    private final Lookup.Result[] results;
    private final Class[] watch;

    // @GuarderBy initLock
    private volatile boolean isCalculated = false;

    // @GuardedBy refreshRequestLock
    private int refreshRequested = 0;

    //~ Constructors -------------------------------------------------------------------------------------------------------------

    /**
     * Constructor for global actions. E.g. actions in main menu which
     * listen to the global context.
     */
    ProjectSensitiveAction(final ProfilerProjectActionPerformer performer, final String name, final String namePattern,
                           final Icon icon, Lookup lookup) {
        super(name);

        if (icon != null) {
            putValue(SMALL_ICON, icon);
        }

        if (lookup == null) {
            lookup = Utilities.actionsGlobalContext();
        }

        this.lookup = lookup;
        this.watch = new Class[] { Project.class, DataObject.class };
        this.results = new Lookup.Result[watch.length];

        // Needs to listen on changes in results
        for (int i = 0; i < watch.length; i++) {
            final Lookup.Result result = lookup.lookup(new Lookup.Template(watch[i]));
            // #147348 - Action instance is probobly only weakly held; we must add the strong reference to lookup listener
//            resultListeners[i] = (LookupListener) WeakListeners.create(LookupListener.class, this, result);
//            result.addLookupListener(resultListeners[i]);
            result.addLookupListener(this);
            // MUST hold on the reference to the result; otherwise it will vanish in a puff of smoke
            results[i] = result;
        }

        this.performer = performer;
        this.namePattern = namePattern;

        init();
    }

    //~ Methods ------------------------------------------------------------------------------------------------------------------

    /**
     * Needs to override isEnabled in order to force refresh
     */
    public final boolean isEnabled() {
        init(); // the action must be initialized

        return super.isEnabled();
    }

    public final void actionPerformed(final ActionEvent e) {
        actionPerformed(lookup);
    }

    public static ProjectSensitiveAction projectSensitiveAction(final ProfilerProjectActionPerformer performer,
                                                                final String name, final String namePattern, final Icon icon) {
        return new ProjectSensitiveAction(performer, name, namePattern, icon, null);
    }

    // Implementation of ContextAwareAction ------------------------------------
    public Action createContextAwareInstance(final Lookup actionContext) {
        return new ProjectSensitiveAction(getPerformer(), getName(), getNamePattern(), (Icon) getValue(SMALL_ICON), actionContext);
    }

    // Implementation of LookupListener ----------------------------------------
    public final void resultChanged(final LookupEvent e) {
        isCalculated = false;
    }

    protected final void setDisplayName(final String name) {
        putValue(NAME, name);
    }

    protected final String getName() {
        return (String) getValue(NAME);
    }

    protected final String getNamePattern() {
        return namePattern;
    }

    protected final ProfilerProjectActionPerformer getPerformer() {
        return performer;
    }

    protected void actionPerformed(final Lookup context) {
        final Project[] projects = ActionsUtil.getProjectsFromLookup(context, null);

        if (projects.length == 1) {
            if (performer != null) {
                new NBSwingWorker(false) {
                        private boolean isEnabled = false;
                        private final OutputParameter<Boolean> isCancelled = new OutputParameter<Boolean>(Boolean.FALSE);
                        private final OutputParameter<ProgressDisplayer> progress = new OutputParameter<ProgressDisplayer>(null);

                        protected void doInBackground() {
                            isEnabled = performer.enable(projects[0], context, false);
                        }

                        protected void done() {
                            if (progress.isSet()) {
                                progress.getValue().close();
                            }

                            if (isEnabled && !isCancelled.getValue()) {
                                performer.perform(projects[0], context);
                            } else if (!isCancelled.getValue()) {
                                ProfilerDialogs.displayInfo(NbBundle.getMessage(ProjectSensitiveAction.class, "AntActions_LazyEnablementFailure")); // NOI18N
                            }
                        }

                        protected void nonResponding() {
                            progress.setValue(ProfilerProgressDisplayer.getDefault().showProgress(
                                    java.util.ResourceBundle.getBundle("org/netbeans/modules/profiler/actions/Bundle") // NOI18N
                                        .getString("AntActions_LazyEnablementProgressMessage"), // NOI18N
                                    new ProgressDisplayer.ProgressController() {
                                    public boolean cancel() {
                                        if (progress.isSet()) {
                                            progress.getValue().close();
                                        }

                                        progress.setValue(null);
                                        isCancelled.setValue(true);

                                        return true;
                                    }
                                }));
                        }
                    }.execute();
            }
        }
    }

    protected void doRefresh(final Lookup context) {
        final Project[] projects = ActionsUtil.getProjectsFromLookup(context, null);

        setDisplayName(ActionsUtil.formatProjectSensitiveName(getNamePattern(), projects));

        if ((projects != null) && (projects.length == 1)) { // must be selected single project
            setEnabled(getPerformer().enable(projects[0], context, true));
        } else {
            setEnabled(false);
        }
    }

    /**
     * Initializes the action
     */
    private void init() {
        if (isCalculated) {
            return;
        }

        synchronized (initLock) {
            if (isCalculated) {
                return;
            }

            refresh(ProjectSensitiveAction.this.lookup);
            isCalculated = true;
        }
    }

    private void refresh(final Lookup context) {
        synchronized (refreshRequestLock) {
            if (refreshRequested++ > 0) {
                return;
            }

            CommonUtils.runInEventDispatchThread(new Runnable() {
                    public void run() {
                        int oldReqCount = -1;
                        int currentReqCount = -1;

                        synchronized (refreshRequestLock) {
                            oldReqCount = refreshRequested;
                        }

                        doRefresh(lookup);

                        synchronized (refreshRequestLock) {
                            currentReqCount = refreshRequested;
                            refreshRequested = 0;
                        }

                        if (oldReqCount != currentReqCount) {
                            refresh(context);
                        }
                    }
                });
        }
    }
}




/*
 * 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.nbimpl.actions;

import org.netbeans.api.project.Project;
import org.netbeans.lib.profiler.common.Profiler;
import org.netbeans.modules.profiler.api.project.ProjectProfilingSupport;
import org.netbeans.modules.profiler.nbimpl.NetBeansProfiler;
import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher.Session;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.ui.support.ProjectActionPerformer;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
import org.openide.util.lookup.ProxyLookup;

/**
 *
 * @author Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
 */
public class ProjectSensitivePerformer implements ProjectActionPerformer {
    final private String command;
    
    public ProjectSensitivePerformer(String command) {
        this.command = command;
    }
    
    @Override
    public boolean enable(Project project) {
        if (project == null) return false;

        ActionProvider ap = project.getLookup().lookup(ActionProvider.class);
        try {
            if (ap != null && ap.isActionEnabled(command, project.getLookup())) {
                ProjectProfilingSupport ppp = ProjectProfilingSupport.get(project);
                if (ppp == null) {
                    return false;
                }
                return ppp.isProfilingSupported();
            }
        } catch (IllegalArgumentException e) {
            // no provider responds to the command
        }
        return false;
    }

    @Override
    public void perform(final Project project) {
        final ActionProvider ap = project.getLookup().lookup(ActionProvider.class);
        if (ap != null) {
            Lookup ctx = new ProxyLookup(project.getLookup(), Lookups.fixed(project));
            
            Session s = ProfilerLauncher.newSession(command, ctx);
            if (s != null) {
                s.run();
            }
        }
    }
}




            </folder>
        </folder>
    </folder>
    
    <folder name="Projects">
        <folder name="Profiler_Actions_temporary">
            <file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.shadow">
                <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.instance"/>
            </file>
        </folder>
    </folder>

    <folder name="Loaders">
        <folder name="text">
            <folder name="x-java">
                <folder name="Actions">
                    <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.shadow">
                        <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.instance"/>
                        <attr name="position" intvalue="1200"/>
                    </file>
                </folder>
            </folder>
            <folder name="x-jsp">
                <folder name="Actions">
                    <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.shadow">
                        <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.instance"/>
                        <attr name="position" intvalue="800"/>
                    </file>
                </folder>
            </folder>
            <folder name="x-fx">
                <folder name="Actions">
                    <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.shadow">
                        <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.instance"/>
                        <attr name="position" intvalue="660"/>
                    </file>
                </folder>
            </folder>
        </folder>
    </folder>

    <folder name="Menu">
        <folder name="Profile">
            <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.shadow">
                <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.instance"/>
                <attr name="position" intvalue="100"/>
            </file>
            <folder name="ProfileOther">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.profiler.nbimpl.actions.Bundle"/>
                <attr name="position" intvalue="300"/>
                <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileProjectAction.shadow">
                    <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileProjectAction.instance"/>
                    <attr name="position" intvalue="100"/>
                </file>
                <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleAction.shadow">
                    <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleAction.instance"/>
                    <attr name="position" intvalue="200"/>
                </file>
                <attr boolvalue="true" name="org-netbeans-modules-profiler-nbimpl-actions-ProfileProjectAction.instance"/>
                <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileTestAction.shadow">
                    <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileTestAction.instance"/>
                    <attr name="position" intvalue="300"/>
                </file>
            </folder>
            <folder name="Advanced">
                <file name="org-netbeans-modules-profiler-nbimpl-actions-UnintegrateProfilerAction.shadow">
                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.unintegrateProfiler"/>
                    <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-UnintegrateProfilerAction.instance"/>
                    <attr name="position" intvalue="500"/>
                </file>
            </folder>

            <attr boolvalue="true" name="org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.instance"/>
        </folder>
    </folder>

    <folder name="Toolbars">
        <folder name="Build">

            </file>
        </folder>
    </folder>

    <folder name="Shortcuts">
        <file name="A-F2.shadow">
            <attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.instance"/>
        </file>
    </folder>

    <folder name="Actions">
        <folder name="Profile">
            <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleAction.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileSingle"/>
            </file>
            <!-- XXX impl is nearly the same, really just different label... should probably share an Action instance -->
            <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileSinglePopup"/>
            </file>
            <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileTestAction.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileTest"/>
            </file>
            <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileProjectAction.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileProject"/>
            </file>
            <file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileMainProject"/>
            </file>
            <file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileProjectPopup"/>
            </file>
            <file name="org-netbeans-modules-profiler-nbimpl-actions-UnintegrateProfilerAction.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.unintegrateProfiler"/>
            </file>
        </folder>
    </folder>

</filesystem>

Lines 42-50 Link Here

(-)a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectProfilingSupportProvider.java (-2 / +82 lines)
42	package org.netbeans.modules.profiler.nbimpl.project;	42	package org.netbeans.modules.profiler.nbimpl.project;
43		43
44	import org.netbeans.api.project.Project;	44	import org.netbeans.api.project.Project;
		45	import org.netbeans.lib.profiler.common.SessionSettings;
		46	import org.netbeans.lib.profiler.utils.MiscUtils;
		47	import org.netbeans.modules.profiler.actions.JavaPlatformSelector;
		48	import org.netbeans.modules.profiler.api.JavaPlatform;
		49	import org.netbeans.modules.profiler.api.ProfilerDialogs;
		50	import org.netbeans.modules.profiler.api.ProfilerIDESettings;
45	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;	51	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;
46	import org.netbeans.modules.profiler.spi.project.ProjectProfilingSupportProvider;	52	import org.netbeans.modules.profiler.spi.project.ProjectProfilingSupportProvider;
47	import org.openide.filesystems.FileObject;	53	import org.openide.filesystems.FileObject;
		54	import org.openide.util.NbBundle;
48		55
49	/**	56	/**
50	*	57	*
Lines 53-59 Link Here
53	public abstract class JavaProjectProfilingSupportProvider extends ProjectProfilingSupportProvider.Basic {	60	public abstract class JavaProjectProfilingSupportProvider extends ProjectProfilingSupportProvider.Basic {
54		61
55	private final Project project;	62	private final Project project;
56		63	private JavaPlatform projectJavaPlatform = null;
57		64
58	@Override	65	@Override
59	public boolean isProfilingSupported() {	66	public boolean isProfilingSupported() {
Lines 74-80 Link Here
74		81
75	@Override	82	@Override
76	public boolean checkProjectCanBeProfiled(FileObject profiledClassFile) {	83	public boolean checkProjectCanBeProfiled(FileObject profiledClassFile) {
77	return true;	84	return getProjectJavaPlatform() != null;
		85	}
		86
		87	@Override
		88	public void setupProjectSessionSettings(SessionSettings ss) {
		89	JavaPlatform platform = getProjectJavaPlatform();
		90
		91	ss.setSystemArchitecture(platform.getPlatformArchitecture());
		92	ss.setJavaVersionString(platform.getPlatformJDKVersion());
		93	ss.setJavaExecutable(platform.getPlatformJavaFile());
		94	}
		95
		96	@Override
		97	@NbBundle.Messages({
		98	"IncorrectJavaSpecVersionDialogCaption=Warning",
		99	"IncorrectJavaSpecVersionDialogMsg=The specification version of project Java Platform is greater than specification version of the\nplatform that will be used for profiling. You may experience problems unless you set the compiler\nparameter to generate bytecode compatible with the platform that will be used.\n\nDo you want to continue with the current settings?"
		100	})
		101	final synchronized public JavaPlatform getProjectJavaPlatform() {
		102	if (projectJavaPlatform == null) {
		103	// 1. check if we have a Java platform to use for profiling
		104	final ProfilerIDESettings gps = ProfilerIDESettings.getInstance();
		105	JavaPlatform platform = JavaPlatform.getJavaPlatformById(gps.getJavaPlatformForProfiling());
		106	projectJavaPlatform = resolveProjectJavaPlatform();
		107
		108	if (platform == null) { // should use the one defined in project
		109	platform = projectJavaPlatform;
		110
		111	if ((platform == null) \|\| !MiscUtils.isSupportedJVM(platform.getSystemProperties())) {
		112	platform = JavaPlatformSelector.getDefault().selectPlatformToUse();
		113
		114	if (platform == null) {
		115	return null;
		116	}
		117	projectJavaPlatform = platform;
		118	}
		119	}
		120
		121	if (projectJavaPlatform != null) { // check that the project platform is not newer than platform to use
		122
		123	while (true) {
		124	if (projectJavaPlatform.getVersion().compareTo(platform.getVersion()) > 0) {
		125	Boolean ret = ProfilerDialogs.displayCancellableConfirmation(
		126	Bundle.IncorrectJavaSpecVersionDialogMsg(),
		127	Bundle.IncorrectJavaSpecVersionDialogCaption());
		128
		129	if (Boolean.TRUE.equals(ret)) {
		130	break;
		131	} else if (Boolean.FALSE.equals(ret)) {
		132	platform = JavaPlatformSelector.getDefault().selectPlatformToUse();
		133
		134	if (platform == null) {
		135	return null; // cancelled by the user
		136	}
		137	} else { // cancelled
		138
		139	return null;
		140	}
		141	} else {
		142	break; // version comparison OK.
		143	}
		144	}
		145	}
		146	}
		147	return projectJavaPlatform;
		148	}
149
150	abstract protected JavaPlatform resolveProjectJavaPlatform();
151
152	protected final JavaPlatform getPlatformByName(String platformName) {
153	if (platformName == null \|\| platformName.equals("default_platform")) { // NOI18N
154	return JavaPlatform.getDefaultPlatform();
155	}
156
157	return JavaPlatform.getJavaPlatformById(platformName);
78	}	158	}
79		159
80	protected final Project getProject() {	160	protected final Project getProject() {




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 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 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.profiler.nbimpl.providers;

import java.util.*;
import org.netbeans.api.extexecution.startup.StartupExtender;
import org.netbeans.api.extexecution.startup.StartupExtender.StartMode;
import org.netbeans.api.project.Project;
import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher;
import org.netbeans.spi.extexecution.startup.StartupExtenderImplementation;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;

/**
 *
 * @author Jaroslav Bachorik
 */
@NbBundle.Messages({
    "DESC_NBProfiler=NetBeans Profiler"
})
@StartupExtenderImplementation.Registration(displayName="#DESC_NBProfiler", position=1000, startMode={
    StartupExtender.StartMode.PROFILE,
    StartupExtender.StartMode.TEST_PROFILE
})
public class DefaultProfilerArgsProvider implements StartupExtenderImplementation {
    @Override
    public List<String> getArguments(Lookup context, StartMode mode) {
        Project p = context.lookup(Project.class);
        if (p != null) {
            ProfilerLauncher.Session s = ProfilerLauncher.getLastSession();
            if (s != null) {
                Map<String, String> m = ProfilerLauncher.getLastSession().getProperties();
                if (m != null) {
                    String agentArgs = m.get("agent.jvmargs");
                    String jvmargs = m.get("profiler.info.jvmargs");
                    jvmargs = jvmargs.replace(" -", "^");
                    StringTokenizer st = new StringTokenizer(jvmargs, "^");
                    
                    List<String> args = new ArrayList<String>();
                    args.add(agentArgs);
                    while (st.hasMoreTokens()) {
                        String arg = st.nextToken();
                        if (!arg.isEmpty()) {
                            args.add((arg.startsWith("-") ? "" : "-") + arg);
                        }
                    }
                    return args;
                }
            }
        }
        return Collections.EMPTY_LIST;
    }
}




import org.openide.util.Utilities;
import org.w3c.dom.Element;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.netbeans.api.java.platform.JavaPlatformManager;
import org.netbeans.api.java.platform.Specification;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.lib.profiler.common.Profiler;
import org.netbeans.lib.profiler.common.SessionSettings;
import org.netbeans.lib.profiler.common.integration.IntegrationUtils;
import org.netbeans.modules.profiler.api.JavaPlatform;
import org.netbeans.modules.profiler.api.java.JavaProfilerSource;

    }

    @Override
    public JavaPlatform resolveProjectJavaPlatform() {
        return getProjectJavaPlatform(getProject());
    }
    

    }

    @Override
    public void configurePropertiesForProfiling(final Map<String, String> props, final FileObject profiledClassFile) {
        // FIXME
        JavaProfilerSource src = JavaProfilerSource.createFrom(profiledClassFile);
        if (src != null) {
            final String profiledClass = src.getTopLevelClass().getQualifiedName();
            props.put("profile.class", profiledClass); //NOI18N
            // Set for all cases (incl. Profile Project, Profile File) but should only
            // be taken into account when profiling single test
            props.put("test.type", getTestType(profiledClassFile)); //NOI18N
        }
        
        String agentArg = props.get("agent.jvmargs"); //NOI18N
        if (agentArg.indexOf(' ') != -1) { //NOI18N
            if (Utilities.isUnix()) {
                // Profiler is installed in directory with space on Unix (Linux, Solaris, Mac OS X)
                // create temporary link in /tmp directory and use it instead of directory with space
                String libsDir = Profiler.getDefault().getLibsDir();
                props.put("agent.jvmargs", IntegrationUtils.fixLibsDirPath(libsDir, agentArg)); //NOI18N
            } else if (Utilities.isWindows() && isNbSourceModule(getProject())) {
                // Profiler is installed in directory with space on Windows
                // surround the whole -agentpath argument with quotes for NB source module
                agentArg = "\"" + agentArg + "\""; //NOI18N
                props.put("agent.jvmargs", agentArg); //NOI18N
            }
        }
    }

    @Override
    public void setupProjectSessionSettings(SessionSettings ss) {
        JavaPlatform platform = getProjectJavaPlatform();
        
        ss.setSystemArchitecture(platform.getPlatformArchitecture());
        ss.setJavaVersionString(platform.getPlatformJDKVersion());
        ss.setJavaExecutable(platform.getPlatformJavaFile());
    }
    
    
    
    /**
     * Returns true if the provided Project is a NB source module, false otherwise.

Lines 78-83 Link Here

(-)a/profiler.stp/src/org/netbeans/modules/profiler/stp/SelectProfilingTask.java (-21 / +34 lines)
78	import javax.swing.SwingConstants;	78	import javax.swing.SwingConstants;
79	import javax.swing.SwingUtilities;	79	import javax.swing.SwingUtilities;
80	import javax.swing.event.ChangeListener;	80	import javax.swing.event.ChangeListener;
		81	import org.netbeans.api.progress.ProgressUtils;
81	import org.netbeans.lib.profiler.common.CommonUtils;	82	import org.netbeans.lib.profiler.common.CommonUtils;
82	import org.netbeans.lib.profiler.ui.UIUtils;	83	import org.netbeans.lib.profiler.ui.UIUtils;
83	import org.netbeans.modules.profiler.api.ProfilerDialogs;	84	import org.netbeans.modules.profiler.api.ProfilerDialogs;
Lines 258-269 Link Here
258	initClosedProjectHook();	259	initClosedProjectHook();
259	initComponents();	260	initComponents();
260	initTasks();	261	initTasks();
261	SwingUtilities.invokeLater(new Runnable() {	262	Runnable r = new Runnable() {
262	public void run() {	263	public void run() {
263	initTaskChooserSize();	264	initTaskChooserSize();
264	initPreferredSize();	265	initPreferredSize();
265	}	266	}
266	});	267	};
		268	if (SwingUtilities.isEventDispatchThread()) {
		269	r.run();
		270	} else {
		271	SwingUtilities.invokeLater(r);
		272	}
267	}	273	}
268		274
269	private static void initColors() {	275	private static void initColors() {
Lines 383-420 Link Here
383	}	389	}
384		390
385	// --- Public interface ------------------------------------------------------	391	// --- Public interface ------------------------------------------------------
386	public static Configuration selectProfileProjectTask(Lookup.Provider project, FileObject profiledFile, boolean enableOverride) {	392	public static Configuration selectProfileProjectTask(final Lookup.Provider project, final FileObject profiledFile, final boolean enableOverride) {
387	// Running this code in EDT would cause deadlock	393	// Running this code in EDT would cause deadlock
388	assert !SwingUtilities.isEventDispatchThread();	394	// assert !SwingUtilities.isEventDispatchThread();
389		395
390	final SelectProfilingTask spt = getDefault();	396	final SelectProfilingTask[] spt = new SelectProfilingTask[1];
391	spt.setSubmitButton(spt.runButton);
392	spt.setupProfileProject(project, profiledFile, enableOverride);
393
394	String targetName = Utils.getProjectName(project) + ((profiledFile == null) ? "" : (": " + profiledFile.getNameExt())); // NOI18N
395	spt.dd = new DialogDescriptor(spt, Bundle.SelectProfilingTask_ProfileDialogCaption(targetName), true,
396	new Object[] { spt.runButton, spt.cancelButton }, spt.runButton, 0, null, null);
397		397
398	final CountDownLatch latch = new CountDownLatch(1);	398	final CountDownLatch latch = new CountDownLatch(1);
399		399
400	SwingUtilities.invokeLater(new Runnable() {	400	Runnable r = new Runnable() {
401		401
402	public void run() {	402	public void run() {
403	Dialog d = DialogDisplayer.getDefault().createDialog(spt.dd);	403	spt[0] = getDefault();
		404	spt[0].setSubmitButton(spt[0].runButton);
		405	spt[0].setupProfileProject(project, profiledFile, enableOverride);
		406
		407	String targetName = Utils.getProjectName(project) + ((profiledFile == null) ? "" : (": " + profiledFile.getNameExt())); // NOI18N
		408	spt[0].dd = new DialogDescriptor(spt, Bundle.SelectProfilingTask_ProfileDialogCaption(targetName), true,
		409	new Object[] { spt[0].runButton, spt[0].cancelButton }, spt[0].runButton, 0, null, null);
		410	Dialog d = DialogDisplayer.getDefault().createDialog(spt[0].dd);
404	d.getAccessibleContext().setAccessibleDescription(d.getTitle());	411	d.getAccessibleContext().setAccessibleDescription(d.getTitle());
405	d.pack();	412	d.pack();
406	d.setVisible(true);	413	d.setVisible(true);
407	latch.countDown();	414	latch.countDown();
408	}	415	}
409	});	416	};
		417
		418	if (SwingUtilities.isEventDispatchThread()) {
		419	r.run();
		420	} else {
		421	SwingUtilities.invokeLater(r);
		422	}
410		423
411	try {	424	try {
412	latch.await();	425	latch.await();
413		426
414	Configuration result = null;	427	Configuration result = null;
415		428
416	if (spt.dd.getValue() == spt.runButton) {	429	if (spt[0].dd.getValue() == spt[0].runButton) {
417	ProfilingSettings settings = spt.createFinalSettings();	430	ProfilingSettings settings = spt[0].createFinalSettings();
418	if (settings.getOverrideGlobalSettings()) {	431	if (settings.getOverrideGlobalSettings()) {
419	String workDir = settings.getWorkingDir().trim();	432	String workDir = settings.getWorkingDir().trim();
420	if (workDir.length() != 0 && !new java.io.File(workDir).exists()) {	433	if (workDir.length() != 0 && !new java.io.File(workDir).exists()) {
Lines 427-433 Link Here
427		440
428	}	441	}
429		442
430	spt.cleanup(result != null);	443	spt[0].cleanup(result != null);
431		444
432	return result;	445	return result;
433	} catch (InterruptedException e) {	446	} catch (InterruptedException e) {

Lines 289-294 Link Here

(-)a/profiler/nbproject/project.xml (+1 lines)
289	<friend>org.netbeans.modules.profiler.freeform</friend>	289	<friend>org.netbeans.modules.profiler.freeform</friend>
290	<friend>org.netbeans.modules.profiler.heapwalker</friend>	290	<friend>org.netbeans.modules.profiler.heapwalker</friend>
291	<friend>org.netbeans.modules.profiler.j2ee</friend>	291	<friend>org.netbeans.modules.profiler.j2ee</friend>
		292	<friend>org.netbeans.modules.profiler.j2se</friend>
292	<friend>org.netbeans.modules.profiler.nbimpl</friend>	293	<friend>org.netbeans.modules.profiler.nbimpl</friend>
293	<friend>org.netbeans.modules.profiler.ppoints</friend>	294	<friend>org.netbeans.modules.profiler.ppoints</friend>
294	<friend>org.netbeans.modules.profiler.snaptracer</friend>	295	<friend>org.netbeans.modules.profiler.snaptracer</friend>

Lines 1663-1669 Link Here

(-)a/profiler/src/org/netbeans/modules/profiler/NetBeansProfiler.java (-2 / +5 lines)
1663	controlPanel2.requestActive();	1663	controlPanel2.requestActive();
1664	}	1664	}
1665		1665
1666	private void setupDispatcher(ProfilingSettings profilingSettings) {	1666	public void setupDispatcher(ProfilingSettings profilingSettings) {
		1667	lastProfilingSettings = profilingSettings;
1667	synchronized (setupLock) {	1668	synchronized (setupLock) {
1668	final Lookup.Provider project = getProfiledProject();	1669	final Lookup.Provider project = getProfiledProject();
1669		1670
Lines 1752-1758 Link Here
1752	}	1753	}
1753	}	1754	}
1754	}	1755	}
1755		1756
1756	ProfilingPointsProcessor ppp = getProfilingPointsManager();	1757	ProfilingPointsProcessor ppp = getProfilingPointsManager();
1757	if (ppp != null) ppp.init(getProfiledProject());	1758	if (ppp != null) ppp.init(getProfiledProject());
1758		1759
Lines 1763-1768 Link Here
1763	// Used for killing an agent which could cause a collision on port	1764	// Used for killing an agent which could cause a collision on port
1764	// Returns true if TERMINATE_TARGET_JVM was invoked on agent (not necessarily killed!), false if the agent is already profiling (port is used)	1765	// Returns true if TERMINATE_TARGET_JVM was invoked on agent (not necessarily killed!), false if the agent is already profiling (port is used)
1765	private boolean shutdownAgent(String host, int port) {	1766	private boolean shutdownAgent(String host, int port) {
		1767	if (port == -1) return false; // invalid port
		1768
1766	Socket clientSocket = null;	1769	Socket clientSocket = null;
1767	ObjectOutputStream socketOut = null;	1770	ObjectOutputStream socketOut = null;
1768	ObjectInputStream socketIn = null;	1771	ObjectInputStream socketIn = null;

Lines 51-56 Link Here

(-)a/profiler/src/org/netbeans/modules/profiler/actions/JavaPlatformSelector.java (+1 lines)
51	import javax.swing.*;	51	import javax.swing.*;
52	import javax.swing.event.ListSelectionEvent;	52	import javax.swing.event.ListSelectionEvent;
53	import javax.swing.event.ListSelectionListener;	53	import javax.swing.event.ListSelectionListener;
		54	import org.netbeans.modules.profiler.api.JavaPlatform;
54	import org.netbeans.modules.profiler.api.ProfilerDialogs;	55	import org.netbeans.modules.profiler.api.ProfilerDialogs;
55	import org.openide.DialogDisplayer;	56	import org.openide.DialogDisplayer;
56		57




package org.netbeans.modules.profiler.actions;

import org.netbeans.lib.profiler.ProfilerLogger;
import org.netbeans.lib.profiler.TargetAppRunner;
import org.netbeans.lib.profiler.common.*;
import org.netbeans.modules.profiler.NetBeansProfiler;
import org.netbeans.modules.profiler.ui.panels.PIDSelectPanel;

import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import java.io.IOException;
import org.netbeans.lib.profiler.TargetAppRunner;
import org.netbeans.modules.profiler.api.ProfilerDialogs;
import org.netbeans.modules.profiler.api.project.ProjectStorage;
import org.netbeans.modules.profiler.api.TaskConfigurator;

    "ProfilingSupport_FailedLoadSettingsMsg=Failed to load attach settings: {0}"
})
public final class ProfilingSupport {
    public static final String RERUN_PROP = "profiler.rerun";
    //~ Inner Classes ------------------------------------------------------------------------------------------------------------

    public static class AttachSTPData {

Lines 119-125 Link Here

(-)a/profiler/src/org/netbeans/modules/profiler/actions/ResetResultsAction.java (-1 / +1 lines)
119	@ActionRegistration(displayName="#LBL_ResetResultsAction", lazy=false)	119	@ActionRegistration(displayName="#LBL_ResetResultsAction", lazy=false)
120	@ActionReferences({	120	@ActionReferences({
121	@ActionReference(path="Menu/Profile", position=900),	121	@ActionReference(path="Menu/Profile", position=900),
122	@ActionReference(path = "Shortcuts", name = "AS-F2")	122	@ActionReference(path = "Shortcuts", name = "CA-F2")
123	})	123	})
124	public static ResetResultsAction getInstance() {	124	public static ResetResultsAction getInstance() {
125	return Singleton.INSTANCE;	125	return Singleton.INSTANCE;




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="Profiler.Actions">
            <api name="general"/>
            <summary>Profiler actions are an integral part of the project infrastructure - just like the debugger actions</summary>
            <version major="1" minor="43"/>
            <date day="23" month="3" year="2011"/>
            <author login="yardus"/>
            <compatibility addition="yes"/>
            <description>
                <p>
                    In order to be able to fully integrate the profiler with the project infrastructure
                    it is necessary to add three new constants to 
                    <code>ActionProvider</code> SPI for profiling a project, profiling a single file and
                    profiling a test for single file. 
                </p>
            </description>
            <class package="org.netbeans.spi.project" name="ActionProvider"/>
            <issue number="203519"/>
        </change>
        <change id="SourceGroup.contains.IAE">
            <api name="general"/>
            <summary><code>SourceGroup.contains</code> no longer throws <code>IllegalArgumentException</code></summary>

Lines 1-7 Link Here

(-)a/projectapi/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.projectapi/1	2	OpenIDE-Module: org.netbeans.modules.projectapi/1
3	OpenIDE-Module-Install: org/netbeans/modules/projectapi/Installer.class	3	OpenIDE-Module-Install: org/netbeans/modules/projectapi/Installer.class
4	OpenIDE-Module-Specification-Version: 1.42	4	OpenIDE-Module-Specification-Version: 1.43
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/projectapi/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/projectapi/Bundle.properties
6	OpenIDE-Module-Layer: org/netbeans/modules/projectapi/layer.xml	6	OpenIDE-Module-Layer: org/netbeans/modules/projectapi/layer.xml
7		7




    String COMMAND_DEBUG_STEP_INTO = "debug.stepinto"; // NOI18N
    
    /**
     * Standard command for running the project in profiler
     * @since 1.43
     */
    String COMMAND_PROFILE = "profile"; // NOI18N
    
    /**
     * Standard command for running single file in profiler
     * @since 1.43
    */
    String COMMAND_PROFILE_SINGLE = "profile.single"; // NOI18N
    
    /** 
     * Standard command for running one test in profiler
     * @since 1.43
    */
    String COMMAND_PROFILE_TEST_SINGLE = "profile.test.single"; // NOI18N
    
    /**
     * Standard command for deleting the project.
     *
     * @since 1.6

Lines 110-116 Link Here

(-)a/projectapi/src/org/netbeans/spi/project/SingleMethod.java (-1 / +1 lines)
110	* @since 1.19	110	* @since 1.19
111	*/	111	*/
112	public static final String COMMAND_DEBUG_SINGLE_METHOD = "debug.single.method";	112	public static final String COMMAND_DEBUG_SINGLE_METHOD = "debug.single.method";
113		113
114	@Override	114	@Override
115	public boolean equals(Object obj) {	115	public boolean equals(Object obj) {
116	if ((obj == null) \|\| (obj.getClass() != SingleMethod.class)) {	116	if ((obj == null) \|\| (obj.getClass() != SingleMethod.class)) {




        COMMAND_RUN_SINGLE,
        COMMAND_DEBUG,
        COMMAND_DEBUG_SINGLE,
        COMMAND_PROFILE,
        COMMAND_PROFILE_SINGLE,
        WebProjectConstants.COMMAND_REDEPLOY,
        JavaProjectConstants.COMMAND_JAVADOC,
        COMMAND_TEST,
        COMMAND_TEST_SINGLE,
        COMMAND_DEBUG_TEST_SINGLE,
        COMMAND_PROFILE_TEST_SINGLE,
        SingleMethod.COMMAND_RUN_SINGLE_METHOD,
        SingleMethod.COMMAND_DEBUG_SINGLE_METHOD,
        JavaProjectConstants.COMMAND_DEBUG_FIX,

        COMMAND_COMPILE_SINGLE,
        COMMAND_RUN_SINGLE,
        COMMAND_DEBUG_SINGLE,
        COMMAND_PROFILE_SINGLE,
        JavaProjectConstants.COMMAND_JAVADOC,
        COMMAND_TEST,
        COMMAND_TEST_SINGLE,
        COMMAND_DEBUG_TEST_SINGLE,
        COMMAND_PROFILE_TEST_SINGLE,
        SingleMethod.COMMAND_RUN_SINGLE_METHOD,
        SingleMethod.COMMAND_DEBUG_SINGLE_METHOD
    };

    /**Set of commands which are affected by background scanning*/

        commands.put(COMMAND_DEBUG, new String[]{"debug"}); // NOI18N
        // the target name is debug, except for Java files with main method, where it is debug-single-main
        commands.put(COMMAND_DEBUG_SINGLE, new String[]{"debug-single-main"}); // NOI18N
        commands.put(COMMAND_PROFILE, new String[]{"profile"}); // NOI18N
        commands.put(COMMAND_PROFILE_SINGLE, new String[]{"profile-single-main"}); // NOI18N
        commands.put(JavaProjectConstants.COMMAND_JAVADOC, new String[]{"javadoc"}); // NOI18N
        commands.put(COMMAND_TEST, new String[]{"test"}); // NOI18N
        commands.put(COMMAND_TEST_SINGLE, new String[]{"test-single"}); // NOI18N
        commands.put(COMMAND_DEBUG_TEST_SINGLE, new String[]{"debug-test"}); // NOI18N
        commands.put(COMMAND_PROFILE_TEST_SINGLE, new String[]{"profile-test"}); // NOI18N
        commands.put(JavaProjectConstants.COMMAND_DEBUG_FIX, new String[]{"debug-fix"}); // NOI18N
        commands.put(COMMAND_VERIFY, new String[]{"verify"}); // NOI18N
        this.bkgScanSensitiveActions = new HashSet<String>(Arrays.asList(
            COMMAND_RUN_SINGLE,
            COMMAND_PROFILE_SINGLE
        ));

        this.needJavaModelActions = new HashSet<String>(Arrays.asList(


    @Override
    protected void updateJavaRunnerClasspath(String command, Map<String, Object> execProperties) {
        if (COMMAND_TEST_SINGLE.equals(command) || COMMAND_DEBUG_TEST_SINGLE.equals(command) || COMMAND_PROFILE_TEST_SINGLE.equals(command) ||
            SingleMethod.COMMAND_DEBUG_SINGLE_METHOD.equals(command) || SingleMethod.COMMAND_RUN_SINGLE_METHOD.equals(command) ||
            COMMAND_RUN_SINGLE.equals(command) || COMMAND_DEBUG_SINGLE.equals(command) || COMMAND_PROFILE_SINGLE.equals(command)) {
            FileObject fo = (FileObject)execProperties.get(JavaRunner.PROP_EXECUTE_FILE);
            ClassPath cp = getCallback().findClassPath(fo, ClassPath.EXECUTE);
            ClassPath cp2 = ClassPathFactory.createClassPath(


    @Override
    protected boolean handleJavaClass(Properties p, FileObject javaFile, String command, List<String> targetNames) {
        return runServlet(p, javaFile, "LBL_RunAction", COMMAND_DEBUG_SINGLE.equals(command), COMMAND_PROFILE_SINGLE.equals(command), targetNames);
    }

    @Override

        if (command.equals(COMMAND_RUN_SINGLE) ||command.equals(COMMAND_RUN) ||
            command.equals(WebProjectConstants.COMMAND_REDEPLOY) ||command.equals(COMMAND_DEBUG) ||
            command.equals(COMMAND_DEBUG_SINGLE) || command.equals(JavaProjectConstants.COMMAND_DEBUG_FIX) ||
            command.equals(COMMAND_PROFILE) || command.equals(COMMAND_PROFILE_SINGLE) ||
            command.equals( COMMAND_TEST_SINGLE) || command.equals(COMMAND_DEBUG_TEST_SINGLE) || command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
            setDirectoryDeploymentProperty(p);
        }


        if (isDebugged()) {
            p.setProperty("is.debugged", "true");
        }
        if (command.equals(COMMAND_RUN_SINGLE) || command.equals(COMMAND_DEBUG_SINGLE) || command.equals(COMMAND_PROFILE_SINGLE)) {
            String res[] = super.getTargetNames(command, context, p, doJavaChecks);
            if (res != null) {
                return res;

                if (!keepDebugging) {
                    return null;
                }
            } else if (command.equals(COMMAND_PROFILE_SINGLE)) {
                targetNames = new String[]{"profile"};
            } else {
                targetNames = new String[]{"run"};
            }

                return null;
            }
            return commands.get(command);
        } else if (command.equals(COMMAND_PROFILE)) {
            if (!isSelectedServer()) {
                return null;
            }
            initWebServiceProperties(p);
        } else if (command.equals(COMMAND_DEBUG)) {
            if (!isSelectedServer()) {
                return null;


    // Fix for IZ#170419 - Invoking Run took 29110 ms.
    private boolean runServlet( Properties p, FileObject javaFile, String
            actionName , boolean debug, boolean profile, List<String> targetNames) 
    {
        assert !(debug && profile);
        
        // run servlet
        // PENDING - what about servlets with main method? servlet should take
        // precedence

            return runEmptyMapping(javaFile);
        }
        p.setProperty(BaseActionProvider.PROPERTY_RUN_SINGLE_ON_SERVER, "yes");
        if (profile) {
            targetNames.add("profile"); // NOI18N
        } else if (debug) {
            targetNames.add("debug"); // NOI18N
        } else {
            targetNames.add("run"); // NOI18N
        }
        return true;
    }


        }
        if (command.equals(COMMAND_COMPILE_SINGLE) ||
            command.equals(COMMAND_DEBUG_SINGLE) ||
            command.equals(COMMAND_RUN_SINGLE) ||
            command.equals(COMMAND_PROFILE_SINGLE)) {
            if (findJsps(context) != null || findHtml(context) != null ) {
                return true;
            } else {




                            <jvmarg line="${{endorsed.classpath.cmd.line.arg}}"/>
                            <jvmarg value="-ea"/>
                            <jvmarg line="${{runmain.jvmargs}}"/>
                            <jvmarg line="${{run.jvmargs.ide}}"/>
                        </junit>
                    </sequential>
                </macrodef>

                <property name="ap.cmd.line.internal" value=""/>
            </target>

            <xsl:comment>
                pre NB7.2 profiling section; consider it deprecated
            </xsl:comment>
            <target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-check">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>

            <target name="-profile-pre-init">
                <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
                <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>

            <target name="-profile-post-init">
                <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
                <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
            </target>
            <target name="-profile-init-check">
                <xsl:attribute name="depends">-profile-pre-init, init, -profile-post-init</xsl:attribute>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
                <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
                <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
            </target>
            <xsl:comment>
                end of pre NB7.2 profiling section
            </xsl:comment>

            <target name="init">
                <xsl:attribute name="depends">-pre-init,-init-private<xsl:if test="/p:project/p:configuration/libs:libraries/libs:definitions">,-init-libraries</xsl:if>,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline</xsl:attribute>

            =================
            </xsl:comment>

            <xsl:comment>
                pre NB7.2 profiling section; consider it deprecated
            </xsl:comment>
            <target name="-profile-pre72">
                <xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
                <condition>
                    <xsl:attribute name="property">profiler.startserver.target</xsl:attribute>
                    <xsl:attribute name="value">start-profiled-server-extraargs</xsl:attribute>

                    <xsl:attribute name="target">run</xsl:attribute>
                </antcall>
                <antcall>
                    <xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
                </antcall>
            </target>

            <target name="start-profiled-server" if="profiler.info.jvmargs.agent">
                <nbstartprofiledserver>
                    <xsl:attribute name="forceRestart">${profiler.j2ee.serverForceRestart}</xsl:attribute>
                    <xsl:attribute name="startupTimeout">${profiler.j2ee.serverStartupTimeout}</xsl:attribute>

                </nbstartprofiledserver>
            </target>

            <target name="start-profiled-server-extraargs" if="profiler.info.jvmargs.agent">
                <nbstartprofiledserver>
                    <xsl:attribute name="forceRestart">${profiler.j2ee.serverForceRestart}</xsl:attribute>
                    <xsl:attribute name="startupTimeout">${profiler.j2ee.serverStartupTimeout}</xsl:attribute>

                    </jvmarg>
                </nbstartprofiledserver>
            </target>
            
            <target name="-profile-test-single-pre72">
                <xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
                <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
                <xsl:attribute name="depends">profile-init,compile-test-single</xsl:attribute>
                <nbprofiledirect>
                    <classpath>
                        <path path="${{run.test.classpath}}"/>
                        <path path="${{j2ee.platform.classpath}}"/>
                    </classpath>
                </nbprofiledirect>

                <junit showoutput="true" fork="true" dir="${{profiler.info.dir}}"  jvm="${{profiler.info.jvm}}" failureproperty="tests.failed" errorproperty="tests.failed">
                    <env key="${{profiler.info.pathvar}}" path="${{profiler.info.agentpath}}:${{profiler.current.path}}"/>
                    <jvmarg value="${{profiler.info.jvmargs.agent}}" />
                    <jvmarg line="${{profiler.info.jvmargs}}"/>
                    <test name="${{profile.class}}"/>
                    <classpath>
                        <path path="${{run.test.classpath}}"/>
                        <path path="${{j2ee.platform.classpath}}"/>
                    </classpath>
                    <syspropertyset>
                        <propertyref prefix="test-sys-prop."/>
                        <mapper type="glob" from="test-sys-prop.*" to="*"/>
                    </syspropertyset>
                    <formatter type="brief" usefile="false"/>
                    <formatter type="xml"/>
                </junit>
            </target>

            <target name="-profile-check" if="netbeans.home">
                <condition property="profiler.configured">
                    <or>
                        <contains string="${{run.jvmargs.ide}}" substring="-agentpath:" casesensitive="false"/>
                        <contains string="${{run.jvmargs.ide}}" substring="-javaagent:" casesensitive="false"/>
                    </or>
                </condition>
            </target>

            <target name="profile" depends="-profile-check,init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent">
                <xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
                
                <startprofiler/>
                <nbstartserver profilemode="true"/>
                
                <nbdeploy profilemode="true" clientUrlPart="${{client.urlPart}}" forceRedeploy="true" />
                <antcall>
                    <xsl:attribute name="target">debug-display-browser</xsl:attribute>
                </antcall>
                <antcall>
                    <xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
                </antcall>
            </target>
            
            <target name="profile-test-single" depends="-profile-test-single-pre72"/>
            
            <target name="profile-test" depends="-profile-check" if="profiler.configured" unless="profiler.info.jvmargs.agent">
                <startprofiler/>
                <antcall target="test-single"/>
            </target>

            <target name="-profile-start-loadgen" if="profiler.loadgen.path">
                <loadgenstart>
                    <xsl:attribute name="path">${profiler.loadgen.path}</xsl:attribute>
                </loadgenstart>
            </target>

            <xsl:comment>

                <xsl:attribute name="if">netbeans.home</xsl:attribute>
                <xsl:attribute name="depends">init,-pre-debug-fix,-do-debug-fix-test</xsl:attribute>
            </target>
            
        <xsl:comment>
        =========================
        TESTS PROFILING  SECTION
        =========================
        </xsl:comment>

          <target name="profile-test-single">
              <xsl:attribute name="if">netbeans.home</xsl:attribute>
              <xsl:attribute name="depends">profile-init,compile-test-single</xsl:attribute>
              <nbprofiledirect>
                  <classpath>
                      <path path="${{run.test.classpath}}"/>
                      <path path="${{j2ee.platform.classpath}}"/>
                  </classpath>
              </nbprofiledirect>

              <junit showoutput="true" fork="true" dir="${{profiler.info.dir}}"  jvm="${{profiler.info.jvm}}" failureproperty="tests.failed" errorproperty="tests.failed">
                  <env key="${{profiler.info.pathvar}}" path="${{profiler.info.agentpath}}:${{profiler.current.path}}"/>
                  <jvmarg value="${{profiler.info.jvmargs.agent}}" />
                  <jvmarg line="${{profiler.info.jvmargs}}"/>
                  <test name="${{profile.class}}"/>
                  <classpath>
                      <path path="${{run.test.classpath}}"/>
                      <path path="${{j2ee.platform.classpath}}"/>
                  </classpath>
                  <syspropertyset>
                      <propertyref prefix="test-sys-prop."/>
                      <mapper type="glob" from="test-sys-prop.*" to="*"/>
                  </syspropertyset>
                  <formatter type="brief" usefile="false"/>
                  <formatter type="xml"/>
              </junit>
          </target>

            <xsl:comment>
                

Lines 234-243 Link Here

(-)a/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml (-4 lines)
234	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>	234	<attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugProjectAction.instance"/>
235	<attr name="position" intvalue="900"/>	235	<attr name="position" intvalue="900"/>
236	</file>	236	</file>
237	<file name="Profiler_Actions_temporary.shadow">
238	<attr name="originalFile" stringvalue="Projects/Profiler_Actions_temporary"/>
239	<attr name="position" intvalue="1000"/>
240	</file>
241	<file name="Rest_Actions_holder.shadow">	237	<file name="Rest_Actions_holder.shadow">
242	<attr name="originalFile" stringvalue="Projects/Rest_Actions_holder"/>	238	<attr name="originalFile" stringvalue="Projects/Rest_Actions_holder"/>
243	<attr name="position" intvalue="1050"/>	239	<attr name="position" intvalue="1050"/>

Return to bug 203519

Lines 111-116 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/Actions.java (-2 / +5 lines)
111	*/	111	*/
112	private static final Set<String> COMMON_IDE_GLOBAL_ACTIONS = new HashSet<String>(Arrays.asList(	112	private static final Set<String> COMMON_IDE_GLOBAL_ACTIONS = new HashSet<String>(Arrays.asList(
113	ActionProvider.COMMAND_DEBUG,	113	ActionProvider.COMMAND_DEBUG,
		114	ActionProvider.COMMAND_PROFILE,
114	ActionProvider.COMMAND_DELETE,	115	ActionProvider.COMMAND_DELETE,
115	ActionProvider.COMMAND_COPY,	116	ActionProvider.COMMAND_COPY,
116	ActionProvider.COMMAND_MOVE,	117	ActionProvider.COMMAND_MOVE,
Lines 193-199 Link Here
193	// Check whether the context contains files all in this folder,	194	// Check whether the context contains files all in this folder,
194	// matching the pattern if any, and matching the arity (single/multiple).	195	// matching the pattern if any, and matching the arity (single/multiple).
195	Map<String,FileObject> selection = findSelection(contextEl, context, project,	196	Map<String,FileObject> selection = findSelection(contextEl, context, project,
196	command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) \|\| command.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD) ? new AtomicReference<String>() : null);	197	command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) \|\|
		198	command.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD) ? new AtomicReference<String>() : null);
197	LOG.log(Level.FINE, "detected selection {0} for command {1} in {2}", new Object[] {selection, command, project});	199	LOG.log(Level.FINE, "detected selection {0} for command {1} in {2}", new Object[] {selection, command, project});
198	if (selection.size() == 1) {	200	if (selection.size() == 1) {
199	// Definitely enabled.	201	// Definitely enabled.
Lines 372-378 Link Here
372	}	374	}
373	Element contextEl = XMLUtil.findElement(actionEl, "context", FreeformProjectType.NS_GENERAL); // NOI18N	375	Element contextEl = XMLUtil.findElement(actionEl, "context", FreeformProjectType.NS_GENERAL); // NOI18N
374	if (contextEl != null) {	376	if (contextEl != null) {
375	AtomicReference<String> methodName = SingleMethod.COMMAND_RUN_SINGLE_METHOD.equals(command) \|\| SingleMethod.COMMAND_DEBUG_SINGLE_METHOD.equals(command) ?	377	AtomicReference<String> methodName = SingleMethod.COMMAND_RUN_SINGLE_METHOD.equals(command) \|\|
		378	SingleMethod.COMMAND_DEBUG_SINGLE_METHOD.equals(command) ?
376	new AtomicReference<String>() : null;	379	new AtomicReference<String>() : null;
377	Map<String,FileObject> selection = findSelection(contextEl, context, project, methodName);	380	Map<String,FileObject> selection = findSelection(contextEl, context, project, methodName);
378	if (selection.isEmpty()) {	381	if (selection.isEmpty()) {

Lines 46-61 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java (-19 / +66 lines)
46		46
47	import java.io.File;	47	import java.io.File;
48	import java.io.IOException;	48	import java.io.IOException;
49	import java.util.Arrays;	49	import java.util.*;
50	import java.util.Collection;
51	import java.util.Collections;
52	import java.util.HashMap;
53	import java.util.HashSet;
54	import java.util.LinkedList;
55	import java.util.Map;
56	import java.util.Map.Entry;	50	import java.util.Map.Entry;
57	import java.util.Properties;
58	import java.util.Set;
59	import java.util.regex.Pattern;	51	import java.util.regex.Pattern;
60	import javax.lang.model.element.TypeElement;	52	import javax.lang.model.element.TypeElement;
61	import javax.swing.Action;	53	import javax.swing.Action;
Lines 116-122 Link Here
116		108
117	static final Set<String> bkgActions = new HashSet<String>(Arrays.asList(	109	static final Set<String> bkgActions = new HashSet<String>(Arrays.asList(
118	COMMAND_RUN_SINGLE,	110	COMMAND_RUN_SINGLE,
119	COMMAND_DEBUG_SINGLE	111	COMMAND_DEBUG_SINGLE,
		112	COMMAND_PROFILE_SINGLE
120	));	113	));
121		114
122	private static final String COMMAND_NBM = "nbm";	115	private static final String COMMAND_NBM = "nbm";
Lines 162-168 Link Here
162	}	155	}
163	globalCommands.put(ActionProvider.COMMAND_RUN, new String[] {"run"}); // NOI18N	156	globalCommands.put(ActionProvider.COMMAND_RUN, new String[] {"run"}); // NOI18N
164	globalCommands.put(ActionProvider.COMMAND_DEBUG, new String[] {"debug"}); // NOI18N	157	globalCommands.put(ActionProvider.COMMAND_DEBUG, new String[] {"debug"}); // NOI18N
165	globalCommands.put("profile", new String[] {"profile"}); // NOI18N	158	globalCommands.put(ActionProvider.COMMAND_PROFILE, new String[] {"profile"}); // NOI18N
166	globalCommands.put(JavaProjectConstants.COMMAND_JAVADOC, new String[] {"javadoc-nb"}); // NOI18N	159	globalCommands.put(JavaProjectConstants.COMMAND_JAVADOC, new String[] {"javadoc-nb"}); // NOI18N
167	globalCommands.put(ActionProvider.COMMAND_TEST, new String[] {"test-unit"}); // NOI18N	160	globalCommands.put(ActionProvider.COMMAND_TEST, new String[] {"test-unit"}); // NOI18N
168	globalCommands.put(COMMAND_NBM, new String[] {COMMAND_NBM});	161	globalCommands.put(COMMAND_NBM, new String[] {COMMAND_NBM});
Lines 172-179 Link Here
172	if (!project.supportedTestTypes().isEmpty()) {	165	if (!project.supportedTestTypes().isEmpty()) {
173	supportedActionsSet.add(ActionProvider.COMMAND_TEST_SINGLE);	166	supportedActionsSet.add(ActionProvider.COMMAND_TEST_SINGLE);
174	supportedActionsSet.add(ActionProvider.COMMAND_DEBUG_TEST_SINGLE);	167	supportedActionsSet.add(ActionProvider.COMMAND_DEBUG_TEST_SINGLE);
		168	supportedActionsSet.add(ActionProvider.COMMAND_PROFILE_TEST_SINGLE);
175	supportedActionsSet.add(ActionProvider.COMMAND_RUN_SINGLE);	169	supportedActionsSet.add(ActionProvider.COMMAND_RUN_SINGLE);
176	supportedActionsSet.add(ActionProvider.COMMAND_DEBUG_SINGLE);	170	supportedActionsSet.add(ActionProvider.COMMAND_DEBUG_SINGLE);
		171	supportedActionsSet.add(ActionProvider.COMMAND_PROFILE_SINGLE);
177	supportedActionsSet.add(SingleMethod.COMMAND_RUN_SINGLE_METHOD);	172	supportedActionsSet.add(SingleMethod.COMMAND_RUN_SINGLE_METHOD);
178	supportedActionsSet.add(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD);	173	supportedActionsSet.add(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD);
179	}	174	}
Lines 212-223 Link Here
212	if (testSources == null)	207	if (testSources == null)
213	testSources = findTestSources(context, false);	208	testSources = findTestSources(context, false);
214	return testSources != null && testSources.isSingle();	209	return testSources != null && testSources.isSingle();
		210	} else if (command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
		211	TestSources testSources = findTestSourcesForSources(context);
		212	if (testSources == null)
		213	testSources = findTestSources(context, false);
		214	return testSources != null && testSources.isSingle();
215	} else if (command.equals(COMMAND_RUN_SINGLE)) {	215	} else if (command.equals(COMMAND_RUN_SINGLE)) {
216	return findTestSources(context, false) != null;	216	return findTestSources(context, false) != null;
217	} else if (command.equals(COMMAND_DEBUG_SINGLE)) {	217	} else if (command.equals(COMMAND_DEBUG_SINGLE)) {
218	TestSources testSources = findTestSources(context, false);	218	TestSources testSources = findTestSources(context, false);
219	return testSources != null && testSources.isSingle();	219	return testSources != null && testSources.isSingle();
220	} else if (command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) \|\| command.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD)) {	220	} else if (command.equals(COMMAND_PROFILE_SINGLE)) {
		221	TestSources testSources = findTestSources(context, false);
		222	return testSources != null && testSources.isSingle();
		223	} else if (command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) \|\|
		224	command.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD)
		225	) {
221	NbPlatform plaf = project.getPlatform(false);	226	NbPlatform plaf = project.getPlatform(false);
222	if (plaf == null \|\| plaf.getHarnessVersion().compareTo(HarnessVersion.V70) < 0) {	227	if (plaf == null \|\| plaf.getHarnessVersion().compareTo(HarnessVersion.V70) < 0) {
223	return false;	228	return false;
Lines 396-401 Link Here
396		401
397	}	402	}
398	targetNames = setupDebugTestSingle(p, testSources);	403	targetNames = setupDebugTestSingle(p, testSources);
		404	} else if (command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
		405	TestSources testSources = findTestSourcesForSources(context);
		406	if (testSources == null) {
		407	testSources = findTestSources(context, false);
		408
		409	}
		410	targetNames = setupProfileTestSingle(p, testSources);
399	} else if (command.equals(COMMAND_RUN_SINGLE)) {	411	} else if (command.equals(COMMAND_RUN_SINGLE)) {
400	TestSources testSources = findTestSources(context, false);	412	TestSources testSources = findTestSources(context, false);
401	// TODO CoS String enableQuickTest = project.evaluator().getProperty("quick.test.single"); // NOI18N	413	// TODO CoS String enableQuickTest = project.evaluator().getProperty("quick.test.single"); // NOI18N
Lines 422-427 Link Here
422	// fallback to "old" debug tests behavior	434	// fallback to "old" debug tests behavior
423	targetNames = setupDebugTestSingle(p, testSources);	435	targetNames = setupDebugTestSingle(p, testSources);
424	}	436	}
		437	} else if (command.equals(COMMAND_PROFILE_SINGLE)) {
		438	TestSources testSources = findTestSources(context, false);
		439	String clazz = getMainClass(context);
		440	if (clazz != null) {
		441	targetNames = setupProfileMain(p, testSources, context, clazz);
		442	} else {
		443	// fallback to "old" debug tests behavior
		444	targetNames = setupProfileTestSingle(p, testSources);
		445	}
425	} else if (command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD)) {	446	} else if (command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD)) {
426	TestSources testSources = findTestMethodSources(context);	447	TestSources testSources = findTestMethodSources(context);
427	p.setProperty("test.class", testClassName(testSources)); // NOI18N	448	p.setProperty("test.class", testClassName(testSources)); // NOI18N
Lines 461-467 Link Here
461	return;	482	return;
462	} else {	483	} else {
463	// XXX consider passing PM.fP(FU.toFO(SuiteUtils.suiteDirectory(project))) instead for a suite component project:	484	// XXX consider passing PM.fP(FU.toFO(SuiteUtils.suiteDirectory(project))) instead for a suite component project:
464	setRunArgsIde(project, SingleModuleProperties.getInstance(project), command, p, project.getTestUserDirLockFile());
465	if (command.equals(ActionProvider.COMMAND_REBUILD)) {	485	if (command.equals(ActionProvider.COMMAND_REBUILD)) {
466	p.setProperty("do.not.clean.module.config.xml", "true"); // #196192	486	p.setProperty("do.not.clean.module.config.xml", "true"); // #196192
467	}	487	}
Lines 472-477 Link Here
472	}	492	}
473	}	493	}
474	try {	494	try {
		495	setRunArgsIde(project, SingleModuleProperties.getInstance(project), command, p, project.getTestUserDirLockFile());
475	ActionUtils.runTarget(findBuildXml(project), targetNames, p);	496	ActionUtils.runTarget(findBuildXml(project), targetNames, p);
476	} catch (IOException e) {	497	} catch (IOException e) {
477	Util.err.notify(e);	498	Util.err.notify(e);
Lines 483-488 Link Here
483	} else	504	} else
484	runnable.run();	505	runnable.run();
485	}	506	}
		507
		508	private String[] setupProfileTestSingle(Properties p, TestSources testSources) {
		509	p.setProperty("test.includes", testSources.includes().replace("", "/*Test.java")); // NOI18N
		510	p.setProperty("test.type", testSources.testType); // NOI18N
		511	return new String[] {"profile-test-single-nb"}; // NOI18N
		512	}
486		513
487	static void setRunArgsIde(Project project, ModuleProperties modprops, String command, Properties p, File testUserDirLockFile) {	514	static void setRunArgsIde(Project project, ModuleProperties modprops, String command, Properties p, File testUserDirLockFile) {
488	StringBuilder runArgsIde = new StringBuilder();	515	StringBuilder runArgsIde = new StringBuilder();
Lines 491-517 Link Here
491	mode = StartupExtender.StartMode.NORMAL;	518	mode = StartupExtender.StartMode.NORMAL;
492	} else if (command.equals(COMMAND_DEBUG) \|\| command.equals(COMMAND_DEBUG_SINGLE) \|\| command.equals(COMMAND_DEBUG_STEP_INTO)) {	519	} else if (command.equals(COMMAND_DEBUG) \|\| command.equals(COMMAND_DEBUG_SINGLE) \|\| command.equals(COMMAND_DEBUG_STEP_INTO)) {
493	mode = StartupExtender.StartMode.DEBUG;	520	mode = StartupExtender.StartMode.DEBUG;
494	} else if (command.equals("profile")) {	521	} else if (command.equals(COMMAND_PROFILE) \|\| command.equals(COMMAND_PROFILE_SINGLE) \|\| command.equals("profile-osgi")) {
495	mode = StartupExtender.StartMode.PROFILE;	522	mode = StartupExtender.StartMode.PROFILE;
496	} else if (command.equals(COMMAND_TEST) \|\| command.equals(COMMAND_TEST_SINGLE)) {	523	} else if (command.equals(COMMAND_TEST) \|\| command.equals(COMMAND_TEST_SINGLE)) {
497	mode = StartupExtender.StartMode.TEST_NORMAL;	524	mode = StartupExtender.StartMode.TEST_NORMAL;
498	} else if (command.equals(COMMAND_DEBUG_TEST_SINGLE)) {	525	} else if (command.equals(COMMAND_DEBUG_TEST_SINGLE)) {
499	mode = StartupExtender.StartMode.TEST_DEBUG;	526	mode = StartupExtender.StartMode.TEST_DEBUG;
500	} else if (command.equals("profile-test-single-nb")) {	527	} else if (command.equals(COMMAND_PROFILE_TEST_SINGLE)) {
501	mode = StartupExtender.StartMode.TEST_PROFILE;	528	mode = StartupExtender.StartMode.TEST_PROFILE;
502	} else {	529	} else {
503	mode = null;	530	mode = null;
504	}	531	}
		532
		533	boolean isTest = (EnumSet.of(
		534	StartupExtender.StartMode.TEST_PROFILE,
		535	StartupExtender.StartMode.TEST_NORMAL,
		536	StartupExtender.StartMode.TEST_DEBUG).contains(mode) \|\|
		537	command.equals(COMMAND_PROFILE_SINGLE));
505	if (mode != null) {	538	if (mode != null) {
506	JavaPlatform plaf = modprops.getJavaPlatform();	539	JavaPlatform plaf = modprops.getJavaPlatform();
507	Lookup context = Lookups.fixed(project, plaf != null ? plaf : JavaPlatformManager.getDefault().getDefaultPlatform());	540	Lookup context = Lookups.fixed(project, plaf != null ? plaf : JavaPlatformManager.getDefault().getDefaultPlatform());
508	for (StartupExtender group : StartupExtender.getExtenders(context, mode)) {	541	for (StartupExtender group : StartupExtender.getExtenders(context, mode)) {
509	for (String arg : group.getArguments()) {	542	for (String arg : group.getArguments()) {
510	runArgsIde.append("-J").append(arg).append(' ');	543	runArgsIde.append(isTest ? "" : "-J").append(arg).append(' ');
511	}	544	}
512	}	545	}
513	}	546	}
514	if ((command.equals(ActionProvider.COMMAND_RUN) \|\| command.equals(ActionProvider.COMMAND_DEBUG)) // #63652	547	if ((command.equals(ActionProvider.COMMAND_RUN) \|\|
		548	command.equals(ActionProvider.COMMAND_DEBUG) \|\|
		549	command.equals(ActionProvider.COMMAND_PROFILE)) // #63652
515	&& testUserDirLockFile.isFile()) {	550	&& testUserDirLockFile.isFile()) {
516	// #141069: lock file exists, run with bogus option	551	// #141069: lock file exists, run with bogus option
517	runArgsIde.append(TEST_USERDIR_LOCK_PROP_VALUE);	552	runArgsIde.append(TEST_USERDIR_LOCK_PROP_VALUE);
Lines 606-611 Link Here
606	return new String[] {"debug-test-main-nb"}; // NOI18N	641	return new String[] {"debug-test-main-nb"}; // NOI18N
607	}	642	}
608		643
		644	private String[] setupProfileMain(Properties p, TestSources testSources, Lookup context, String mainClass) {
		645	p.setProperty("main.class", mainClass); // NOI18N
		646	p.setProperty("test.type", testSources.testType); // NOI18N
		647	return new String[] {"profile-test-main-nb"}; // NOI18N
		648	}
		649
609	private String testClassName(TestSources testSources) {	650	private String testClassName(TestSources testSources) {
610	String path = testSources.includes();	651	String path = testSources.includes();
611	assert path.endsWith(".java") && !path.contains(",") : path;	652	assert path.endsWith(".java") && !path.contains(",") : path;
Lines 622-633 Link Here
622	private boolean bypassAntBuildScript(String command, FileObject[] files) throws IllegalArgumentException {	663	private boolean bypassAntBuildScript(String command, FileObject[] files) throws IllegalArgumentException {
623	FileObject toRun = null;	664	FileObject toRun = null;
624		665
625	if (COMMAND_RUN_SINGLE.equals(command) \|\| COMMAND_DEBUG_SINGLE.equals(command)) {	666	if (COMMAND_RUN_SINGLE.equals(command) \|\|
		667	COMMAND_DEBUG_SINGLE.equals(command) \|\|
		668	COMMAND_PROFILE_SINGLE.equals(command)) {
626	toRun = files[0];	669	toRun = files[0];
627	}	670	}
628		671
629	if (toRun != null) {	672	if (toRun != null) {
630	String commandToExecute = COMMAND_RUN_SINGLE.equals(command) ? JavaRunner.QUICK_TEST : JavaRunner.QUICK_TEST_DEBUG;	673	String commandToExecute = COMMAND_RUN_SINGLE.equals(command) ?
		674	JavaRunner.QUICK_TEST :
		675	(COMMAND_DEBUG_SINGLE.equals(command) ?
		676	JavaRunner.QUICK_TEST_DEBUG :
		677	JavaRunner.QUICK_TEST_PROFILE);
631	if (!JavaRunner.isSupported(commandToExecute, Collections.singletonMap(JavaRunner.PROP_EXECUTE_FILE, toRun))) {	678	if (!JavaRunner.isSupported(commandToExecute, Collections.singletonMap(JavaRunner.PROP_EXECUTE_FILE, toRun))) {
632	return false;	679	return false;
633	}	680	}

Lines 109-115 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java (-8 / +7 lines)
109	private static final String COMMAND_DEBUG_JNLP = "debug-jnlp";	109	private static final String COMMAND_DEBUG_JNLP = "debug-jnlp";
110	private static final String COMMAND_DEBUG_OSGI = "debug-osgi";	110	private static final String COMMAND_DEBUG_OSGI = "debug-osgi";
111	private static final String COMMAND_NBMS = "nbms";	111	private static final String COMMAND_NBMS = "nbms";
112	private static final String COMMAND_PROFILE = "profile";
113	private static final String COMMAND_PROFILE_OSGI = "profile-osgi";	112	private static final String COMMAND_PROFILE_OSGI = "profile-osgi";
114	private static final String COMMAND_RUN_JNLP = "run-jnlp";	113	private static final String COMMAND_RUN_JNLP = "run-jnlp";
115	private static final String COMMAND_RUN_OSGI = "run-osgi";	114	private static final String COMMAND_RUN_OSGI = "run-osgi";
Lines 242-254 Link Here
242	return ProjectSensitiveActions.projectCommandAction(COMMAND_DEBUG_OSGI, SUITE_ACTION_debug_osgi(), null);	241	return ProjectSensitiveActions.projectCommandAction(COMMAND_DEBUG_OSGI, SUITE_ACTION_debug_osgi(), null);
243	}	242	}
244		243
245	@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.profileOsgi")	244	// @ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.profileOsgi")
246	@ActionRegistration(displayName="#SUITE_ACTION_profile_osgi", lazy=false)	245	// @ActionRegistration(displayName="#SUITE_ACTION_profile_osgi", lazy=false)
247	@ActionReference(path=SUITE_OSGI_ACTIONS_PATH, position=500)	246	// @ActionReference(path=SUITE_OSGI_ACTIONS_PATH, position=500)
248	@Messages("SUITE_ACTION_profile_osgi=Profile in Felix")	247	// @Messages("SUITE_ACTION_profile_osgi=Profile in Felix")
249	public static Action profileOsgi() {	248	// public static Action profileOsgi() {
250	return ProjectSensitiveActions.projectCommandAction(COMMAND_PROFILE_OSGI, SUITE_ACTION_profile_osgi(), null);	249	// return ProjectSensitiveActions.projectCommandAction(COMMAND_PROFILE_OSGI, SUITE_ACTION_profile_osgi(), null);
251	}	250	// }
252		251
253	@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.branding")	252	@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.branding")
254	@ActionRegistration(displayName="#SUITE_ACTION_branding", lazy=false)	253	@ActionRegistration(displayName="#SUITE_ACTION_branding", lazy=false)

Lines 434-439 Link Here

(-)a/apisupport.harness/release/jnlp.xml (+14 lines)
434	<reference refid="cluster.path.id"/>	434	<reference refid="cluster.path.id"/>
435	</antcall>	435	</antcall>
436	</target>	436	</target>
		437
		438	<target name="-profile-check" if="netbeans.home">
		439	<condition property="profiler.configured">
		440	<or>
		441	<contains string="${run.jvmargs.ide}" substring="-agentpath:" casesensitive="false"/>
		442	<contains string="${run.jvmargs.ide}" substring="-javaagent:" casesensitive="false"/>
		443	</or>
		444	</condition>
		445	</target>
		446
		447	<target name="profile" depends="-profile-check,build-jnlp-local" description="Executes this suite as JNLP application under profiler" if="profiler.configured" unless="profiler.info.jvmargs.agent">
		448	<startprofiler/>
		449	<antcall target="run"/>
		450	</target>
437		451
438	<target name="-check-for-jnlp-userdir">	452	<target name="-check-for-jnlp-userdir">
439	<property name="jnlp.userdir" location="${user.home}/.nbapp-${app.name}"/>	453	<property name="jnlp.userdir" location="${user.home}/.nbapp-${app.name}"/>

Lines 159-166 Link Here

(-)a/apisupport.harness/release/osgi.xml (-3 / +20 lines)
159	<reference refid="cluster.path.id"/>	159	<reference refid="cluster.path.id"/>
160	</antcall>	160	</antcall>
161	</target>	161	</target>
162		162
163	<target name="profile">	163	<target name="-profile-check">
		164	<condition property="profiler.configured" if="netbeans.home">
		165	<or>
		166	<contains string="${osgi.run.args}" substring="-agentpath:" casesensitive="false"/>
		167	<contains string="${osgi.run.args}" substring="-javaagent:" casesensitive="false"/>
		168	<contains string="${osgi.run.args.extra}" substring="-agentpath:" casesensitive="false"/>
		169	<contains string="${osgi.run.args.extra}" substring="-javaagent:" casesensitive="false"/>
		170	</or>
		171	</condition>
		172	</target>
		173
		174	<target name="profile" depends="-profile-check,-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent" description="Profile a project in the IDE." unless="profiler.info.jvmargs.agent">
		175	<startprofiler/>
		176	<antcall target="run">
		177	<reference refid="cluster.path.id"/>
		178	</antcall>
		179	</target>
		180
		181	<target name="-profile-pre72" if="profiler.info.jvmargs.agent">
164	<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>	182	<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
165	<nbprofiledirect jvmargsprefix="" jvmargsproperty="profiler.jvmargs">	183	<nbprofiledirect jvmargsprefix="" jvmargsproperty="profiler.jvmargs">
166	<classpath>	184	<classpath>
Lines 184-188 Link Here
184	<reference refid="cluster.path.id"/>	202	<reference refid="cluster.path.id"/>
185	</antcall>	203	</antcall>
186	</target>	204	</target>
187
188	</project>	205	</project>

Lines 228-234 Link Here

(-)a/apisupport.harness/release/run.xml (-2 / +17 lines)
228	</antcall>	228	</antcall>
229	</target>	229	</target>
230		230
231	<target name="profile" description="Profile a project in the IDE.">	231	<target name="-profile-check" if="netbeans.home">
		232	<condition property="profiler.configured">
		233	<or>
		234	<contains string="${run.args.ide}" substring="-agentpath:" casesensitive="false"/>
		235	<contains string="${run.args.ide}" substring="-javaagent:" casesensitive="false"/>
		236	</or>
		237	</condition>
		238	</target>
		239
		240	<target name="profile" depends="-profile-check,-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent" description="Profile a project in the IDE." unless="profiler.info.jvmargs.agent">
		241	<startprofiler/>
		242	<antcall target="run">
		243	<reference refid="cluster.path.id"/>
		244	</antcall>
		245	</target>
		246
		247	<target name="-profile-pre72" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent">
232	<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>	248	<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
233	<nbprofiledirect	249	<nbprofiledirect
234	jvmargsprefix="-J"	250	jvmargsprefix="-J"
Lines 255-259 Link Here
255	<reference refid="cluster.path.id"/>	271	<reference refid="cluster.path.id"/>
256	</antcall>	272	</antcall>
257	</target>	273	</target>
258
259	</project>	274	</project>

Lines 305-328 Link Here

(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl (-10 / +49 lines)
305	</fail>	305	</fail>
306	<taskdef resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml" classpath="${{libs.CopyLibs.classpath}}"/>	306	<taskdef resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml" classpath="${{libs.CopyLibs.classpath}}"/>
307	</target>	307	</target>
308		308
309	<target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-check"/>	309	<xsl:comment>
		310	pre NB7.2 profiling section; consider it deprecated
		311	</xsl:comment>
		312	<target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-check">
		313	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
		314	</target>
310		315
311	<target name="-profile-pre-init">	316	<target name="-profile-pre-init">
312	<xsl:comment> Empty placeholder for easier customization. </xsl:comment>	317	<xsl:comment> Empty placeholder for easier customization. </xsl:comment>
313	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>	318	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
		319	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
314	</target>	320	</target>
315		321
316	<target name="-profile-post-init">	322	<target name="-profile-post-init">
317	<xsl:comment> Empty placeholder for easier customization. </xsl:comment>	323	<xsl:comment> Empty placeholder for easier customization. </xsl:comment>
318	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>	324	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
		325	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
319	</target>	326	</target>
320	<target name="-profile-init-check">	327	<target name="-profile-init-check">
321	<xsl:attribute name="depends">-profile-pre-init, init, -profile-post-init</xsl:attribute>	328	<xsl:attribute name="depends">-profile-pre-init, init, -profile-post-init</xsl:attribute>
322	<fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>	329	<fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
323	<fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>	330	<fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
		331	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
324	</target>	332	</target>
325		333	<xsl:comment>
		334	end of pre NB7.2 profiling section
		335	</xsl:comment>
		336
326	<target name="init">	337	<target name="init">
327	<xsl:attribute name="depends">pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,-init-taskdefs</xsl:attribute>	338	<xsl:attribute name="depends">pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,-init-taskdefs</xsl:attribute>
328	</target>	339	</target>
Lines 848-854 Link Here
848	=================	859	=================
849	</xsl:comment>	860	</xsl:comment>
850		861
851	<target name="profile">	862	<xsl:comment>
		863	pre NB7.2 profiling section; consider it deprecated
		864	</xsl:comment>
		865	<target name="-profile-pre72">
		866	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
852	<xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>	867	<xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
853	<condition>	868	<condition>
854	<xsl:attribute name="property">profiler.startserver.target</xsl:attribute>	869	<xsl:attribute name="property">profiler.startserver.target</xsl:attribute>
Lines 865-871 Link Here
865	<xsl:attribute name="target">run</xsl:attribute>	880	<xsl:attribute name="target">run</xsl:attribute>
866	</antcall>	881	</antcall>
867	<antcall>	882	<antcall>
868	<xsl:attribute name="target">start-loadgen</xsl:attribute>	883	<xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
869	</antcall>	884	</antcall>
870	</target>	885	</target>
871		886
Lines 899-910 Link Here
899	</jvmarg>	914	</jvmarg>
900	</nbstartprofiledserver>	915	</nbstartprofiledserver>
901	</target>	916	</target>
		917	<xsl:comment>
		918	end of pre NB7.2 profiling section
		919	</xsl:comment>
902		920
903	<target name="start-loadgen" if="profiler.loadgen.path">	921	<target name="-profile-check" if="netbeans.home">
904	<loadgenstart>	922	<condition property="profiler.configured">
905	<xsl:attribute name="path">${profiler.loadgen.path}</xsl:attribute>	923	<or>
906	</loadgenstart>	924	<contains string="${{run.jvmargs.ide}}" substring="-agentpath:" casesensitive="false"/>
907	</target>	925	<contains string="${{run.jvmargs.ide}}" substring="-javaagent:" casesensitive="false"/>
		926	</or>
		927	</condition>
		928	</target>
		929
		930	<target name="profile" depends="-profile-check,dist,-profile-pre72" if="profiler.configured">
		931	<xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
		932
		933	<startprofiler/>
		934	<nbstartserver profilemode="true"/>
		935
		936	<nbdeploy profilemode="true" clientUrlPart="${{client.urlPart}}" forceRedeploy="true" />
		937	<antcall>
		938	<xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
		939	</antcall>
		940	</target>
		941
		942	<target name="-profile-start-loadgen" if="profiler.loadgen.path">
		943	<loadgenstart>
		944	<xsl:attribute name="path">${profiler.loadgen.path}</xsl:attribute>
		945	</loadgenstart>
		946	</target>
908		947
909	<xsl:comment>	948	<xsl:comment>
910	CLEANUP SECTION	949	CLEANUP SECTION

Lines 663-668 Link Here

(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl (-44 / +85 lines)
663	<jvmarg line="${{endorsed.classpath.cmd.line.arg}}"/>	663	<jvmarg line="${{endorsed.classpath.cmd.line.arg}}"/>
664	<jvmarg value="-ea"/>	664	<jvmarg value="-ea"/>
665	<jvmarg line="${{runmain.jvmargs}}"/>	665	<jvmarg line="${{runmain.jvmargs}}"/>
		666	<jvmarg line="${{run.jvmargs.ide}}"/>
666	</junit>	667	</junit>
667	</sequential>	668	</sequential>
668	</macrodef>	669	</macrodef>
Lines 858-881 Link Here
858	<target name="-init-ap-cmdline" depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported">	859	<target name="-init-ap-cmdline" depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported">
859	<property name="ap.cmd.line.internal" value=""/>	860	<property name="ap.cmd.line.internal" value=""/>
860	</target>	861	</target>
861		862
862	<target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-check"/>	863	<xsl:comment>
		864	pre NB7.2 profiling section; consider it deprecated
		865	</xsl:comment>
		866	<target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-check">
		867	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
		868	</target>
863		869
864	<target name="-profile-pre-init">	870	<target name="-profile-pre-init">
865	<xsl:comment> Empty placeholder for easier customization. </xsl:comment>	871	<xsl:comment> Empty placeholder for easier customization. </xsl:comment>
866	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>	872	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
		873	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
867	</target>	874	</target>
868		875
869	<target name="-profile-post-init">	876	<target name="-profile-post-init">
870	<xsl:comment> Empty placeholder for easier customization. </xsl:comment>	877	<xsl:comment> Empty placeholder for easier customization. </xsl:comment>
871	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>	878	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
		879	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
872	</target>	880	</target>
873	<target name="-profile-init-check">	881	<target name="-profile-init-check">
874	<xsl:attribute name="depends">-profile-pre-init, init, -profile-post-init</xsl:attribute>	882	<xsl:attribute name="depends">-profile-pre-init, init, -profile-post-init</xsl:attribute>
875	<fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>	883	<fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
876	<fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>	884	<fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
		885	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
877	</target>	886	</target>
878		887	<xsl:comment>
		888	end of pre NB7.2 profiling section
		889	</xsl:comment>
879		890
880	<target name="init">	891	<target name="init">
881	<xsl:attribute name="depends">-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline</xsl:attribute>	892	<xsl:attribute name="depends">-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline</xsl:attribute>
Lines 1430-1437 Link Here
1430	=================	1441	=================
1431	</xsl:comment>	1442	</xsl:comment>
1432		1443
1433	<target name="profile">	1444	<xsl:comment>
		1445	pre NB7.2 profiling section; consider it deprecated
		1446	</xsl:comment>
		1447	<target name="-profile-pre72">
		1448	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
1434	<xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>	1449	<xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
		1450	<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1435	<condition>	1451	<condition>
1436	<xsl:attribute name="property">profiler.startserver.target</xsl:attribute>	1452	<xsl:attribute name="property">profiler.startserver.target</xsl:attribute>
1437	<xsl:attribute name="value">start-profiled-server-extraargs</xsl:attribute>	1453	<xsl:attribute name="value">start-profiled-server-extraargs</xsl:attribute>
Lines 1447-1455 Link Here
1447	<xsl:attribute name="target">run</xsl:attribute>	1463	<xsl:attribute name="target">run</xsl:attribute>
1448	</antcall>	1464	</antcall>
1449	<antcall>	1465	<antcall>
1450	<xsl:attribute name="target">start-loadgen</xsl:attribute>	1466	<xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
1451	</antcall>	1467	</antcall>
1452	</target>	1468	</target>
		1469
		1470	<target name="-profile-test-single-pre72">
		1471	<xsl:attribute name="if">profiler.info.jvmargs.agent</xsl:attribute>
		1472	<xsl:attribute name="depends">profile-init,compile-test-single</xsl:attribute>
		1473	<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
		1474	<nbprofiledirect>
		1475	<classpath>
		1476	<path path="${{run.test.classpath}}"/>
		1477	<path path="${{j2ee.platform.classpath}}"/>
		1478	</classpath>
		1479	</nbprofiledirect>
		1480
		1481	<junit showoutput="true" fork="true" dir="${{profiler.info.dir}}" jvm="${{profiler.info.jvm}}" failureproperty="tests.failed" errorproperty="tests.failed">
		1482	<env key="${{profiler.info.pathvar}}" path="${{profiler.info.agentpath}}:${{profiler.current.path}}"/>
		1483	<jvmarg value="${{profiler.info.jvmargs.agent}}" />
		1484	<jvmarg line="${{profiler.info.jvmargs}}"/>
		1485	<test name="${{profile.class}}"/>
		1486	<classpath>
		1487	<path path="${{run.test.classpath}}"/>
		1488	<path path="${{j2ee.platform.classpath}}"/>
		1489	</classpath>
		1490	<syspropertyset>
		1491	<propertyref prefix="test-sys-prop."/>
		1492	<mapper type="glob" from="test-sys-prop." to=""/>
		1493	</syspropertyset>
		1494	<formatter type="brief" usefile="false"/>
		1495	<formatter type="xml"/>
		1496	</junit>
		1497	</target>
1453		1498
1454	<target name="start-profiled-server">	1499	<target name="start-profiled-server">
1455	<nbstartprofiledserver>	1500	<nbstartprofiledserver>
Lines 1481-1491 Link Here
1481	</jvmarg>	1526	</jvmarg>
1482	</nbstartprofiledserver>	1527	</nbstartprofiledserver>
1483	</target>	1528	</target>
		1529	<xsl:comment>
		1530	end of pre NB7.2 profiling section
		1531	</xsl:comment>
1484		1532
1485	<target name="start-loadgen" if="profiler.loadgen.path">	1533	<target name="-profile-check" if="netbeans.home">
1486	<loadgenstart>	1534	<condition property="profiler.configured">
1487	<xsl:attribute name="path">${profiler.loadgen.path}</xsl:attribute>	1535	<or>
1488	</loadgenstart>	1536	<contains string="${{run.jvmargs.ide}}" substring="-agentpath:" casesensitive="false"/>
		1537	<contains string="${{run.jvmargs.ide}}" substring="-javaagent:" casesensitive="false"/>
		1538	</or>
		1539	</condition>
		1540	</target>
		1541
		1542	<target name="profile" depends="-profile-check,init,compile,dist-directory-deploy,-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent">
		1543	<xsl:attribute name="description">Profile a J2EE project in the IDE.</xsl:attribute>
		1544
		1545	<startprofiler/>
		1546	<nbstartserver profilemode="true"/>
		1547
		1548	<nbdeploy profilemode="true" clientUrlPart="${client.urlPart}" forceRedeploy="true" />
		1549	<antcall>
		1550	<xsl:attribute name="target">-profile-start-loadgen</xsl:attribute>
		1551	</antcall>
		1552	</target>
		1553
		1554	<target name="profile-test-single" depends="-profile-test-single-pre72"/>
		1555
		1556	<target name="profile-test" depends="-profile-check" if="profiler.configured" unless="profiler.info.jvmargs.agent">
		1557	<startprofiler/>
		1558	<antcall target="test-single"/>
		1559	</target>
		1560
		1561	<target name="-profile-start-loadgen" if="profiler.loadgen.path">
		1562	<loadgenstart>
		1563	<xsl:attribute name="path">${profiler.loadgen.path}</xsl:attribute>
		1564	</loadgenstart>
1489	</target>	1565	</target>
1490		1566
1491	<xsl:comment>	1567	<xsl:comment>
Lines 1760-1800 Link Here
1760	<xsl:attribute name="depends">init,-pre-debug-fix,-do-debug-fix-test</xsl:attribute>	1836	<xsl:attribute name="depends">init,-pre-debug-fix,-do-debug-fix-test</xsl:attribute>
1761	</target>	1837	</target>
1762		1838
1763	<xsl:comment>
1764	=========================
1765	TESTS PROFILING SECTION
1766	=========================
1767	</xsl:comment>
1768
1769	<target name="profile-test-single">
1770	<xsl:attribute name="if">netbeans.home</xsl:attribute>
1771	<xsl:attribute name="depends">profile-init,compile-test-single</xsl:attribute>
1772	<nbprofiledirect>
1773	<classpath>
1774	<path path="${{run.test.classpath}}"/>
1775	<path path="${{j2ee.platform.classpath}}"/>
1776	</classpath>
1777	</nbprofiledirect>
1778
1779	<junit showoutput="true" fork="true" dir="${{profiler.info.dir}}" jvm="${{profiler.info.jvm}}" failureproperty="tests.failed" errorproperty="tests.failed">
1780	<env key="${{profiler.info.pathvar}}" path="${{profiler.info.agentpath}}:${{profiler.current.path}}"/>
1781	<jvmarg value="${{profiler.info.jvmargs.agent}}" />
1782	<jvmarg line="${{profiler.info.jvmargs}}"/>
1783	<test name="${{profile.class}}"/>
1784	<classpath>
1785	<path path="${{run.test.classpath}}"/>
1786	<path path="${{j2ee.platform.classpath}}"/>
1787	</classpath>
1788	<syspropertyset>
1789	<propertyref prefix="test-sys-prop."/>
1790	<mapper type="glob" from="test-sys-prop." to=""/>
1791	</syspropertyset>
1792	<formatter type="brief" usefile="false"/>
1793	<formatter type="xml"/>
1794	</junit>
1795	</target>
1796
1797
1798	<xsl:comment>	1839	<xsl:comment>
1799	CLEANUP SECTION	1840	CLEANUP SECTION
1800	</xsl:comment>	1841	</xsl:comment>

Lines 67-72 Link Here

(-)a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java (-17 / +46 lines)
67	import org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener.Artifact;	67	import org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener.Artifact;
68	import org.netbeans.modules.j2ee.deployment.plugins.spi.JDBCDriverDeployer;	68	import org.netbeans.modules.j2ee.deployment.plugins.spi.JDBCDriverDeployer;
69	import java.util.*;	69	import java.util.*;
		70	import java.util.concurrent.ExecutorService;
		71	import java.util.concurrent.Executors;
		72	import java.util.concurrent.ScheduledExecutorService;
		73	import java.util.concurrent.TimeUnit;
70	import java.util.concurrent.TimeoutException;	74	import java.util.concurrent.TimeoutException;
71	import java.util.logging.Level;	75	import java.util.logging.Level;
72	import java.util.logging.Logger;	76	import java.util.logging.Logger;
Lines 373-394 Link Here
373	int oldState = getServerState();	377	int oldState = getServerState();
374	setServerState(STATE_WAITING);	378	setServerState(STATE_WAITING);
375	if (ServerInstance.this == profiledServerInstance) {	379	if (ServerInstance.this == profiledServerInstance) {
376	int profState = ProfilerSupport.getState();	380	updateStateFromProfiler();
377	if (profState == ProfilerSupport.STATE_STARTING) {	381	return;
378	setServerState(ServerInstance.STATE_PROFILER_STARTING);
379	return;
380	} else if (profState == ProfilerSupport.STATE_BLOCKING) {
381	setServerState(ServerInstance.STATE_PROFILER_BLOCKING);
382	return;
383	} else if (profState == ProfilerSupport.STATE_PROFILING
384	\|\| profState == ProfilerSupport.STATE_RUNNING) {
385	initCoTarget();
386	setServerState(ServerInstance.STATE_PROFILING);
387	return;
388	} else {
389	// profiler is inactive - has been shutdown
390	profiledServerInstance = null;
391	}
392	}	382	}
393	if (isSuspended()) {	383	if (isSuspended()) {
394	setServerState(ServerInstance.STATE_SUSPENDED);	384	setServerState(ServerInstance.STATE_SUSPENDED);
Lines 1513-1523 Link Here
1513	profiledServerInstance = null;	1503	profiledServerInstance = null;
1514	}	1504	}
1515		1505
1516	Profiler profiler = ServerRegistry.getProfiler();	1506	final Profiler profiler = ServerRegistry.getProfiler();
1517	if (profiler == null) {	1507	if (profiler == null) {
1518	// this should not occur, but better make sure	1508	// this should not occur, but better make sure
1519	throw new ServerException(NbBundle.getMessage(ServerInstance.class, "MSG_ProfilerNotRegistered"));	1509	throw new ServerException(NbBundle.getMessage(ServerInstance.class, "MSG_ProfilerNotRegistered"));
1520	}	1510	}
		1511
		1512	final ScheduledExecutorService statusUpdater = Executors.newSingleThreadScheduledExecutor();
		1513	statusUpdater.scheduleAtFixedRate(new Runnable() {
		1514
		1515	@Override
		1516	public void run() {
		1517	updateStateFromProfiler();
		1518	}
		1519	}, 50, 100, TimeUnit.MILLISECONDS);
		1520
		1521	final StateListener l = new StateListener() {
		1522
		1523	@Override
		1524	public void stateChanged(int oldState, int newState) {
		1525	if (oldState != newState && newState == STATE_STOPPED) {
		1526	ServerInstance.this.removeStateListener(this);
		1527	statusUpdater.shutdownNow();
		1528	profiledServerInstance = null;
		1529	}
		1530	}
		1531	};
		1532
		1533	this.addStateListener(l);
		1534
1521	profiler.notifyStarting();	1535	profiler.notifyStarting();
1522	ProgressObject po = getStartServer().startProfiling(target);	1536	ProgressObject po = getStartServer().startProfiling(target);
1523	try {	1537	try {
Lines 1995-1998 Link Here
1995	}	2009	}
1996	}	2010	}
1997	}	2011	}
		2012
		2013	private void updateStateFromProfiler() {
		2014	int profState = ProfilerSupport.getState();
		2015	if (profState == ProfilerSupport.STATE_STARTING) {
		2016	setServerState(ServerInstance.STATE_PROFILER_STARTING);
		2017	} else if (profState == ProfilerSupport.STATE_BLOCKING) {
		2018	setServerState(ServerInstance.STATE_PROFILER_BLOCKING);
		2019	} else if (profState == ProfilerSupport.STATE_PROFILING
		2020	\|\| profState == ProfilerSupport.STATE_RUNNING) {
		2021	initCoTarget();
		2022	setServerState(ServerInstance.STATE_PROFILING);
		2023	} else {
		2024	setServerState(ServerInstance.STATE_STOPPED);
		2025	}
		2026	}
1998	}	2027	}

Lines 166-173 Link Here

(-)a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaActionsTest.java (-1 / +60 lines)
166	Arrays.asList(new String[] {	166	Arrays.asList(new String[] {
167	ActionProvider.COMMAND_COMPILE_SINGLE,	167	ActionProvider.COMMAND_COMPILE_SINGLE,
168	ActionProvider.COMMAND_DEBUG,	168	ActionProvider.COMMAND_DEBUG,
		169	ActionProvider.COMMAND_PROFILE,
169	ActionProvider.COMMAND_RUN_SINGLE,	170	ActionProvider.COMMAND_RUN_SINGLE,
170	ActionProvider.COMMAND_DEBUG_SINGLE	171	ActionProvider.COMMAND_DEBUG_SINGLE,
		172	ActionProvider.COMMAND_PROFILE_SINGLE
171	}),	173	}),
172	Arrays.asList(ja.getSupportedActions()));	174	Arrays.asList(ja.getSupportedActions()));
173	/* Not really necessary; once there is a binding, the main ant/freeform Actions will mask this anyway:	175	/* Not really necessary; once there is a binding, the main ant/freeform Actions will mask this anyway:
Lines 563-568 Link Here
563	"</project>\n";	565	"</project>\n";
564	assertEquals(expectedXml, xmlToString(doc.getDocumentElement()));	566	assertEquals(expectedXml, xmlToString(doc.getDocumentElement()));
565	}	567	}
		568
		569	public void testCreateProfileTargetFromScratch() throws Exception {
		570	Document doc = XMLUtil.createDocument("project", null, null, null);
		571	Element genTarget = ja.createProfileTargetFromScratch("profile", doc);
		572	doc.getDocumentElement().appendChild(genTarget);
		573	String expectedXml =
		574	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
		575	"<project>\n" +
		576	" <target name=\"-profile-check\">\n" +
		577	" <startprofiler freeform=\"true\"/>\n" +
		578	" </target>\n" +
		579	" <target depends=\"-profile-check,dist\" if=\"profiler.configured\" name=\"profile\">\n" +
		580	" <path id=\"cp\">\n" +
		581	" <!---->\n" +
		582	" </path>\n" +
		583	" <!---->\n" +
		584	" <java classname=\"some.main.Class\" fork=\"true\">\n" +
		585	" <classpath refid=\"cp\"/>\n" +
		586	" <jvmarg line=\"${agent.jvmargs}\"/>\n" +
		587	" </java>\n" +
		588	" </target>\n" +
		589	"</project>\n";
		590	assertEquals(expectedXml, xmlToString(doc.getDocumentElement()));
		591	}
		592
		593	public void testCreateProfileTargetFromTemplate() throws Exception {
		594	Document doc = XMLUtil.createDocument("project", null, null, null);
		595	Document origDoc = XMLUtil.createDocument("target", null, null, null);
		596	Element origTarget = origDoc.getDocumentElement();
		597	origTarget.setAttribute("name", "ignored");
		598	origTarget.setAttribute("depends", "compile");
		599	origTarget.appendChild(origDoc.createElement("task1"));
		600	Element task = origDoc.createElement("java");
		601	// XXX also test nested <classpath>:
		602	task.setAttribute("classpath", "${cp}");
		603	task.appendChild(origDoc.createElement("stuff"));
		604	origTarget.appendChild(task);
		605	origTarget.appendChild(origDoc.createElement("task2"));
		606	Element genTarget = ja.createProfileTargetFromTemplate("profile", origTarget, task, doc);
		607	doc.getDocumentElement().appendChild(genTarget);
		608	String expectedXml =
		609	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
		610	"<project>\n" +
		611	" <target name=\"-profile-check\">\n" +
		612	" <startprofiler freeform=\"true\"/>\n" +
		613	" </target>\n" +
		614	" <target depends=\"-profile-check,dist\" if=\"profiler.configured\" name=\"profile\">\n" +
		615	" <task1/>\n" +
		616	" <java classpath=\"${cp}\" fork=\"true\">\n" +
		617	" <stuff/>\n" +
		618	" <jvmarg line=\"${agent.jvmargs}\"/>\n" +
		619	" </java>\n" +
		620	" <task2/>\n" +
		621	" </target>\n" +
		622	"</project>\n";
		623	assertEquals(expectedXml, xmlToString(doc.getDocumentElement()));
		624	}
566		625
567	public void testCreateRunSingleTargetElem() throws Exception {	626	public void testCreateRunSingleTargetElem() throws Exception {
568	Document doc = XMLUtil.createDocument("project", null, null, null);	627	Document doc = XMLUtil.createDocument("project", null, null, null);

Lines 43-100 Link Here

(-)a/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-debug-snippet.xml (-41 / +22 lines)
43	Version 2 license, then the option applies only if the new code is	43	Version 2 license, then the option applies only if the new code is
44	made subject to such option by the copyright holder.	44	made subject to such option by the copyright holder.
45	-->	45	-->
46	<project name="{0} (debug-test)" default="debug-test" basedir=".">	46	<project name="{0} (profile-test)" default="profile-test" basedir=".">
		47	<target name="-profile-check" if="netbeans.home">
		48	<condition property="profiler.configured">
		49	<or>
		50	<contains string="${run.jvmargs.ide}" substring="-agentpath:" casesensitive="false"/>
		51	<contains string="${run.jvmargs.ide}" substring="-javaagent:" casesensitive="false"/>
		52	</or>
		53	</condition>
		54	</target>
		55
47	<target name="-check-run-test-single-method-supported" if="methodname">	56	<target name="-check-run-test-single-method-supported" if="methodname">
48	<available property="run.test.single.method.supported"	57	<available property="run.test.single.method.supported"
49	resource="org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.class"/>	58	resource="org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.class"/>
50	<fail unless="run.test.single.method.supported">Execution of a single test method is not supported by this version of Ant.</fail>	59	<fail unless="run.test.single.method.supported">Execution of a single test method is not supported by this version of Ant.</fail>
51	</target>	60	</target>
52	<target name="-init-debug-args">	61	<target name="-prepare-execution">
53	<property name="version-output" value="java version "${ant.java.version}"/>
54	<condition property="have-jdk-older-than-1.4">
55	<or>
56	<contains string="${version-output}" substring="java version "1.0"/>
57	<contains string="${version-output}" substring="java version "1.1"/>
58	<contains string="${version-output}" substring="java version "1.2"/>
59	<contains string="${version-output}" substring="java version "1.3"/>
60	</or>
61	</condition>
62	<condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
63	<istrue value="${have-jdk-older-than-1.4}"/>
64	</condition>
65	<condition property="debug-transport-by-os" value="dt_shmem" else="dt_socket">
66	<os family="windows"/>
67	</condition>
68	<condition property="debug-transport" value="${debug.transport}" else="${debug-transport-by-os}">
69	<isset property="debug.transport"/>
70	</condition>
71	</target>
72	<target name="-prepare-execution" depends="-init-debug-args">
73	<property name="test.result.dir" location="${java.io.tmpdir}"/>	62	<property name="test.result.dir" location="${java.io.tmpdir}"/>
74	<property name="test.result.file"	63	<property name="test.result.file"
75	location="${test.result.dir}/TEST-${classname}.xml"/>	64	location="${test.result.dir}/TEST-${classname}.xml"/>
76	<property name="tmp.dir" value="${basedir}"/>	65	<property name="tmp.dir" value="${basedir}"/>
77	<macrodef name="junit-debug-template">	66	<macrodef name="junit-template">
78	<element name="test-spec" implicit="yes"/>	67	<element name="test-spec" implicit="yes"/>
79	<sequential>	68	<sequential>
80	<translate-classpath classpath="${classpath}" targetProperty="classpath-translated" />	69	<translate-classpath classpath="${classpath}" targetProperty="classpath-translated" />
81	<nbjpdastart addressproperty="jpda.address" name="${classname}" stopclassname="" transport="${debug-transport}" listeningcp="${classpath}">
82	<classpath>
83	<path path="${classpath-translated}"/>
84	</classpath>
85	<bootclasspath>
86	<path path="${platform.bootcp}"/>
87	</bootclasspath>
88	</nbjpdastart>
89	<property name="run.jvmargs" value="" />	70	<property name="run.jvmargs" value="" />
90	<property name="work.dir" value="${basedir}"/>	71	<property name="work.dir" value="${basedir}"/>
		72
		73	<startprofiler/>
91	<junit showoutput="true" fork="true" dir="${work.dir}" jvm="${platform.java}" tempdir="${tmp.dir}">	74	<junit showoutput="true" fork="true" dir="${work.dir}" jvm="${platform.java}" tempdir="${tmp.dir}">
92	<test-spec/>	75	<test-spec/>
93	<classpath path="${classpath-translated}" />	76	<classpath path="${classpath-translated}" />
94	<jvmarg line="${debug-args-line}"/>
95	<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
96	<jvmarg value="-ea"/>	77	<jvmarg value="-ea"/>
97	<jvmarg line="${run.jvmargs}"/>	78	<jvmarg line="${run.jvmargs}"/>
		79	<jvmarg line="${run.jvmargs.ide}"/>
98	<formatter type="brief" usefile="false"/>	80	<formatter type="brief" usefile="false"/>
99	<formatter type="xml" />	81	<formatter type="xml" />
100	<syspropertyset>	82	<syspropertyset>
Lines 106-127 Link Here
106	</macrodef>	88	</macrodef>
107	<translate-classpath classpath="${classpath}" targetProperty="classpath-translated"/>	89	<translate-classpath classpath="${classpath}" targetProperty="classpath-translated"/>
108	</target>	90	</target>
109	<target name="-debug-test-class" depends="-prepare-execution" unless="methodname">	91	<target name="-test-class" depends="-prepare-execution" unless="methodname">
110	<junit-debug-template>	92	<junit-template>
111	<test name="${classname}" todir="${test.result.dir}"/>	93	<test name="${classname}" todir="${test.result.dir}"/>
112	</junit-debug-template>	94	</junit-template>
113	</target>	95	</target>
114	<target name="-debug-test-method" depends="-check-run-test-single-method-supported,-prepare-execution" if="methodname">	96	<target name="-test-method" depends="-check-run-test-single-method-supported,-prepare-execution" if="methodname">
115	<junit-debug-template>	97	<junit-template>
116	<test name="${classname}" methods="${methodname}"	98	<test name="${classname}" methods="${methodname}"
117	todir="${test.result.dir}"/>	99	todir="${test.result.dir}"/>
118	</junit-debug-template>	100	</junit-template>
119	</target>	101	</target>
120	<target name="debug-test" depends="-debug-test-class,-debug-test-method">	102	<target name="profile-test" depends="-profile-check,-test-class,-test-method" if="profiler.configured">
121	<!-- This target is intended to be used in conjunction with the	103	<!-- This target is intended to be used in conjunction with the
122	org.apache.tools.ant.module.spi.AntLogger. Note, the next task	104	org.apache.tools.ant.module.spi.AntLogger. Note, the next task
123	deletes just created test report. -->	105	deletes just created test report. -->
124	<delete file="${test.result.file}" deleteonexit="true" />	106	<delete file="${test.result.file}" deleteonexit="true" />
125	</target>	107	</target>
126
127	</project>	108	</project>

Lines 56-64 Link Here

(-)a/maven.profiler/src/org/netbeans/modules/maven/profiler/ActionMappings.xml (-20 / +14 lines)
56	<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>	56	<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
57	</goals>	57	</goals>
58	<properties>	58	<properties>
59	<exec.args>${profiler.args} -classpath %classpath ${packageClassName}</exec.args>	59	<exec.args>-classpath %classpath ${packageClassName}</exec.args>
60	<exec.executable>${profiler.java}</exec.executable>	60	<exec.executable>java</exec.executable>
61	<profiler.action>profile</profiler.action>
62	</properties>	61	</properties>
63	</action>	62	</action>
64		63
Lines 88-95 Link Here
88	<goal>nbm:run-ide</goal>	87	<goal>nbm:run-ide</goal>
89	</goals>	88	</goals>
90	<properties>	89	<properties>
91	<netbeans.run.params.ide>${profiler.args.prefixed} ${profiler.jdkhome.opt}</netbeans.run.params.ide>	90	<netbeans.run.params.ide/>
92	<profiler.action>profile</profiler.action>
93	</properties>	91	</properties>
94	</action>	92	</action>
95	<action>	93	<action>
Lines 102-131 Link Here
102	<goal>nbm:run-platform</goal>	100	<goal>nbm:run-platform</goal>
103	</goals>	101	</goals>
104	<properties>	102	<properties>
105	<netbeans.run.params.ide>${profiler.args.prefixed} ${profiler.jdkhome.opt}</netbeans.run.params.ide>	103	<netbeans.run.params.ide/>
106	<profiler.action>profile</profiler.action>
107	</properties>	104	</properties>
108	</action>	105	</action>
109		106
110	<action>	107	<action>
111	<actionName>profile-single</actionName>	108	<actionName>profile.single</actionName>
112	<packagings>	109	<packagings>
113	<packaging>jar</packaging>	110	<packaging>*</packaging>
114	</packagings>	111	</packagings>
115	<goals>	112	<goals>
116	<goal>process-classes</goal>	113	<goal>process-classes</goal>
117	<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>	114	<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
118	</goals>	115	</goals>
119	<properties>	116	<properties>
120	<exec.args>${profiler.args} -classpath %classpath ${packageClassName}</exec.args>	117	<exec.args>-classpath %classpath ${packageClassName}</exec.args>
121	<exec.executable>${profiler.java}</exec.executable>	118	<exec.executable>java</exec.executable>
122	<exec.classpathScope>${classPathScope}</exec.classpathScope>	119	<exec.classpathScope>${classPathScope}</exec.classpathScope>
123	<profiler.action>profile-single</profiler.action>
124	</properties>	120	</properties>
125	</action>	121	</action>
126		122
127	<action>	123	<action>
128	<actionName>profile-single.deploy</actionName>	124	<actionName>profile.single.deploy</actionName>
129	<packagings>	125	<packagings>
130	<packaging>war</packaging>	126	<packaging>war</packaging>
131	</packagings>	127	</packagings>
Lines 140-146 Link Here
140	</action>	136	</action>
141		137
142	<action>	138	<action>
143	<actionName>profile-tests</actionName>	139	<actionName>profile.test.single</actionName>
144	<packagings>	140	<packagings>
145	<packaging>*</packaging>	141	<packaging>*</packaging>
146	</packagings>	142	</packagings>
Lines 149-161 Link Here
149	<goal>surefire:test</goal>	145	<goal>surefire:test</goal>
150	</goals>	146	</goals>
151	<properties>	147	<properties>
152	<test>${className}</test>	148	<test>${packageClassName}</test>
153	<forkMode>once</forkMode>	149	<forkMode>once</forkMode>
154	<maven.surefire.debug>${profiler.args} -classpath %classpath</maven.surefire.debug>	150	<maven.surefire.debug>${exec.args}</maven.surefire.debug>
155	<!--<exec.executable>${profiler.java}</exec.executable>	151	<!-- need to declare exec.args property to engage the StartupExtender infrastructure -->
156	<exec.classpathScope>${classPathScope}</exec.classpathScope>	152	<exec.args/>
157	-->
158	<profiler.action>profile-tests</profiler.action>
159	</properties>	153	</properties>
160	</action>	154	</action>
161	</actions>	155	</actions>

Lines 77-83 Link Here

(-)a/maven.profiler/src/org/netbeans/modules/maven/profiler/MavenProjectProfilingSupportProvider.java (-21 / +21 lines)
77	};	77	};
78		78
79		79
80	public JavaPlatform getProjectJavaPlatform() {	80	public JavaPlatform resolveProjectJavaPlatform() {
81	return JavaPlatform.getDefaultPlatform();	81	return JavaPlatform.getDefaultPlatform();
82	}	82	}
83		83
Lines 92-121 Link Here
92		92
93	@Override	93	@Override
94	public boolean startProfilingSession(final FileObject profiledClassFile, final boolean isTest, final Properties properties) {	94	public boolean startProfilingSession(final FileObject profiledClassFile, final boolean isTest, final Properties properties) {
95	RequestProcessor.getDefault().post(new Runnable() {	95	// RequestProcessor.getDefault().post(new Runnable() {
96	public void run() { startMaven(getProject().getLookup().lookup(Project.class), profiledClassFile, isTest, properties); }	96	// public void run() { startMaven(getProject().getLookup().lookup(Project.class), profiledClassFile, isTest, properties); }
97	});	97	// });
98		98
99	return true;	99	return true;
100	}	100	}
101		101
102	private void startMaven(Project project, FileObject profiledClassFile, boolean isTest, Properties properties) {	102	// private void startMaven(Project project, FileObject profiledClassFile, boolean isTest, Properties properties) {
103	ProfilingSettings lastProfilingSettings = new ProfilingSettings();	103	// ProfilingSettings lastProfilingSettings = new ProfilingSettings();
104	SessionSettings lastSessionSettings = new SessionSettings();	104	// SessionSettings lastSessionSettings = new SessionSettings();
105	Properties lastSessionProperties = new Properties(properties);	105	// Properties lastSessionProperties = new Properties(properties);
106		106	//
107	lastProfilingSettings.load(properties);	107	// lastProfilingSettings.load(properties);
108	lastSessionSettings.load(properties);	108	// lastSessionSettings.load(properties);
109		109	//
110	RunCheckerImpl.configureProject(project, lastSessionProperties, lastProfilingSettings, lastSessionSettings);	110	// RunCheckerImpl.configureProject(project, lastSessionProperties, lastProfilingSettings, lastSessionSettings);
111		111	//
112	NetBeansProfiler.getDefaultNB().setProfiledProject(project, profiledClassFile);	112	// NetBeansProfiler.getDefaultNB().setProfiledProject(project, profiledClassFile);
113		113	//
114	String packaging = project.getLookup().lookup(NbMavenProject.class).getPackagingType();	114	// String packaging = project.getLookup().lookup(NbMavenProject.class).getPackagingType();
115		115	//
116	if (profiledClassFile != null) ProjectUtilities.invokeAction(project, isTest ? "profile-tests": (packaging.equals("war") ? "profile-single.deploy" : "profile-single")); //NOI18N	116	// if (profiledClassFile != null) ProjectUtilities.invokeAction(project, isTest ? "profile-tests": (packaging.equals("war") ? "profile-single.deploy" : "profile-single")); //NOI18N
117	else ProjectUtilities.invokeAction(project, isTest ? "profile-tests" : "profile"); //NOI18N	117	// else ProjectUtilities.invokeAction(project, isTest ? "profile-tests" : "profile"); //NOI18N
118	}	118	// }
119		119
120		120
121	public MavenProjectProfilingSupportProvider(Project project) {	121	public MavenProjectProfilingSupportProvider(Project project) {

Lines 48-53 Link Here

(-)a/maven.profiler/src/org/netbeans/modules/maven/profiler/ProfilerActionsProvider.java (-5 / +6 lines)
48	import org.netbeans.modules.maven.api.NbMavenProject;	48	import org.netbeans.modules.maven.api.NbMavenProject;
49	import org.netbeans.modules.maven.spi.actions.AbstractMavenActionsProvider;	49	import org.netbeans.modules.maven.spi.actions.AbstractMavenActionsProvider;
50	import org.netbeans.api.project.Project;	50	import org.netbeans.api.project.Project;
		51	import org.netbeans.spi.project.ActionProvider;
51	import org.openide.util.Lookup;	52	import org.openide.util.Lookup;
52		53
53	/**	54	/**
Lines 68-74 Link Here
68		69
69	@Override	70	@Override
70	public boolean isActionEnable(String action, Project project, Lookup lookup) {	71	public boolean isActionEnable(String action, Project project, Lookup lookup) {
71	if (!(action.equals("profile") \|\| action.startsWith("profile-single") \|\| action.equals("profile-tests"))) {	72	if (!(action.equals(ActionProvider.COMMAND_PROFILE) \|\| action.startsWith(ActionProvider.COMMAND_PROFILE_SINGLE) \|\| action.equals(ActionProvider.COMMAND_PROFILE_TEST_SINGLE))) {
72	return false;	73	return false;
73	}	74	}
74	NbMavenProject mavenprj = project.getLookup().lookup(NbMavenProject.class);	75	NbMavenProject mavenprj = project.getLookup().lookup(NbMavenProject.class);
Lines 81-89 Link Here
81		82
82	@Override	83	@Override
83	protected InputStream getActionDefinitionStream() {	84	protected InputStream getActionDefinitionStream() {
84	String path = "/org/netbeans/modules/maven/profiler/ActionMappings.xml"; //NOI18N	85	String path = "/org/netbeans/modules/maven/profiler/ActionMappings.xml"; //NOI18N
85	InputStream in = getClass().getResourceAsStream(path);	86	InputStream in = getClass().getResourceAsStream(path);
86	assert in != null : "no instream for " + path; //NOI18N	87	assert in != null : "no instream for " + path; //NOI18N
87	return in;	88	return in;
88	}	89	}
89	}	90	}

Lines 43-77 Link Here

(-)a/maven.profiler/src/org/netbeans/modules/maven/profiler/RunCheckerImpl.java (-69 / +98 lines)
43	package org.netbeans.modules.maven.profiler;	43	package org.netbeans.modules.maven.profiler;
44		44
45	import java.io.File;	45	import java.io.File;
46	import java.util.ArrayList;	46	import java.util.*;
47	import java.util.List;
48	import java.util.Map;
49	import java.util.Properties;
50	import java.util.WeakHashMap;
51	import java.util.logging.Level;	47	import java.util.logging.Level;
52	import java.util.logging.Logger;	48	import java.util.logging.Logger;
		49	import org.netbeans.api.project.FileOwnerQuery;
53	import org.netbeans.api.project.Project;	50	import org.netbeans.api.project.Project;
54	import org.netbeans.lib.profiler.common.Profiler;	51	import org.netbeans.lib.profiler.common.Profiler;
55	import org.netbeans.lib.profiler.common.ProfilingSettings;	52	import org.netbeans.lib.profiler.common.ProfilingSettings;
56	import org.netbeans.lib.profiler.common.SessionSettings;	53	import org.netbeans.lib.profiler.common.SessionSettings;
57	import org.netbeans.modules.maven.api.execute.ExecutionContext;	54	import org.netbeans.modules.maven.api.execute.ExecutionContext;
58	import org.netbeans.modules.maven.api.execute.LateBoundPrerequisitesChecker;	55	import org.netbeans.modules.maven.api.execute.LateBoundPrerequisitesChecker;
		56	import org.netbeans.modules.maven.api.execute.PrerequisitesChecker;
59	import org.netbeans.modules.maven.api.execute.RunConfig;	57	import org.netbeans.modules.maven.api.execute.RunConfig;
		58	import org.netbeans.modules.maven.api.execute.RunUtils;
		59	import org.netbeans.modules.profiler.NetBeansProfiler;
		60	import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher;
		61	import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher.Launcher;
		62	import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher.Session;
		63	import org.netbeans.spi.project.ActionProvider;
60	import org.netbeans.spi.project.ProjectServiceProvider;	64	import org.netbeans.spi.project.ProjectServiceProvider;
		65	import org.openide.filesystems.FileObject;
		66	import org.openide.loaders.DataObject;
		67	import org.openide.loaders.DataObjectNotFoundException;
		68	import org.openide.util.Lookup;
61	import org.openide.util.RequestProcessor;	69	import org.openide.util.RequestProcessor;
62	import org.openide.util.Utilities;	70	import org.openide.util.Utilities;
		71	import org.openide.util.lookup.Lookups;
63		72
64	/**	73	/**
65	*	74	*
66	* @author mkleint	75	* @author mkleint
67	* @author Jiri Sedlacek	76	* @author Jiri Sedlacek
68	*/	77	*/
69	@ProjectServiceProvider(service=LateBoundPrerequisitesChecker.class, projectType="org-netbeans-modules-maven")	78	@ProjectServiceProvider(service={LateBoundPrerequisitesChecker.class}, projectType="org-netbeans-modules-maven")
70	public class RunCheckerImpl implements LateBoundPrerequisitesChecker {	79	public class RunCheckerImpl implements LateBoundPrerequisitesChecker {
71
72	private static final String ACTION_PROFILE = "profile"; // NOI18N
73	private static final String ACTION_PROFILE_SINGLE = "profile-single"; // NOI18N
74	private static final String ACTION_PROFILE_TESTS = "profile-tests"; // NOI18N
75		80
76	private static final Logger LOG = Logger.getLogger(RunCheckerImpl.class.getName());	81	private static final Logger LOG = Logger.getLogger(RunCheckerImpl.class.getName());
77		82
Lines 83-172 Link Here
83	private static final String PROFILER_JDKHOME_OPT = "${profiler.jdkhome.opt}"; // NOI18N	88	private static final String PROFILER_JDKHOME_OPT = "${profiler.jdkhome.opt}"; // NOI18N
84		89
85	private final Project project;	90	private final Project project;
86	private static final Map<Project, Properties> properties = new WeakHashMap();
87	private static final Map<Project, ProfilingSettings> profilingSettings = new WeakHashMap();
88	private static final Map<Project, SessionSettings> sessionSettings = new WeakHashMap();
89		91
		92	@ProjectServiceProvider(service=ProfilerLauncher.LauncherFactory.class, projectType="org-netbeans-modules-maven")
		93	final public static class MavenLauncherFactory implements ProfilerLauncher.LauncherFactory {
		94	@Override
		95	public Launcher createLauncher(final Session session) {
		96	return new Launcher() {
		97
		98	@Override
		99	public void launch(boolean rerun) {
		100	if (rerun) {
		101	RunConfig config = (RunConfig)session.getAttribute("mvn-run-checker.config");
		102	if (config != null) {
		103	RunUtils.executeMaven(config);
		104	}
		105	} else {
		106	Project p = session.getProject();
		107	if (p == null) {
		108	FileObject f = session.getFile();
		109	if (f != null) {
		110	p = FileOwnerQuery.getOwner(f);
		111	}
		112	}
		113	if (p != null) {
		114	ActionProvider ap = p.getLookup().lookup(ActionProvider.class);
		115	if (ap != null) {
		116	ap.invokeAction(session.getCommand(), session.getContext());
		117	}
		118	}
		119	}
		120	}
		121	};
		122	}
		123
		124	}
90		125
91	public RunCheckerImpl(Project prj) {	126	public RunCheckerImpl(Project prj) {
92	project = prj;	127	project = prj;
93	}	128	}
94		129
95	static void configureProject(Project project, Properties p, ProfilingSettings ps, SessionSettings ss) {	130	// static void configureProject(Project project, Properties p, ProfilingSettings ps, SessionSettings ss) {
96	properties.put(project, p);	131	// properties.put(project, p);
97	profilingSettings.put(project, ps);	132	// profilingSettings.put(project, ps);
98	sessionSettings.put(project, ss);	133	// sessionSettings.put(project, ss);
99	}	134	// }
		135	//
		136	// private void configureProfiler(RunConfig config, Properties props) {
		137	// ProfilingSettings lastProfilingSettings = new ProfilingSettings();
		138	// SessionSettings lastSessionSettings = new SessionSettings();
		139	//
		140	// lastProfilingSettings.load(props);
		141	// lastSessionSettings.load(props);
		142	//
		143	// NetBeansProfiler.getDefaultNB().setProfiledProject(config.getProject(), config.getSelectedFileObject());
		144	// }
		145
		146	// @Override
		147	// public boolean checkRunConfig(RunConfig config) {
		148	// if (ActionProvider.COMMAND_PROFILE.equals(config.getActionName()) \|\|
		149	// ActionProvider.COMMAND_PROFILE_TEST_SINGLE.equals(config.getActionName()) \|\|
		150	// (config.getActionName() != null && config.getActionName().startsWith(ActionProvider.COMMAND_PROFILE_SINGLE))) {
		151	// isFirstRun = true;
		152	// }
		153	//
		154	// return true;
		155	// }
100		156
101	public boolean checkRunConfig(RunConfig config, ExecutionContext context) {	157	@Override
		158	public boolean checkRunConfig(final RunConfig config, ExecutionContext context) {
102	Map<? extends String,? extends String> configProperties = config.getProperties();	159	Map<? extends String,? extends String> configProperties = config.getProperties();
		160
		161	if (ActionProvider.COMMAND_PROFILE.equals(config.getActionName()) \|\|
		162	ActionProvider.COMMAND_PROFILE_TEST_SINGLE.equals(config.getActionName()) \|\|
		163	(config.getActionName() != null && config.getActionName().startsWith(ActionProvider.COMMAND_PROFILE_SINGLE))) {
		164	Map<String, String> props = new HashMap<String, String>();
		165	props.putAll(configProperties);
103		166
104	if ( ACTION_PROFILE.equals(config.getActionName()) \|\|	167	ProfilerLauncher.Session session = ProfilerLauncher.getLastSession();
105	ACTION_PROFILE_TESTS.equals(config.getActionName()) \|\|	168
106	(config.getActionName() != null && config.getActionName().startsWith(ACTION_PROFILE_SINGLE))) { // action "profile"	169	if (session == null) {
107	// Resolve profiling configuration	170	return false;
108	Properties sessionProperties = properties.get(project);
109	if (sessionProperties == null) return false;
110	// Resolve profiling session properties
111	for (Object k : configProperties.keySet()) {
112	String key = (String)k;
113
114	String value = configProperties.get(key);
115	if (value.contains(PROFILER_ARGS)) {
116	value = value.replace(PROFILER_ARGS, profilerArgs(sessionProperties, false));
117	config.setProperty(key, value.trim());
118	}
119	if (value.contains(PROFILER_ARGS_PREFIXED)) {
120	value = value.replace(PROFILER_ARGS_PREFIXED, profilerArgs(sessionProperties, true));
121	config.setProperty(key, value.trim());
122	}
123	if (value.contains(PROFILER_JAVA)) {
124	String profilerJava = sessionProperties.getProperty("profiler.info.jvm"); // NOI18N
125	value = value.replace(PROFILER_JAVA,
126	(profilerJava != null && new File(profilerJava).isFile()) ? profilerJava : "java"); // NOI18N
127	config.setProperty(key, value.trim());
128	}
129	if (value.contains(PROFILER_JDKHOME_OPT)) {
130	String opt = "";
131	String profilerJava = sessionProperties.getProperty("profiler.info.jvm"); // NOI18N
132	if (profilerJava != null) {
133	File binJava = new File(profilerJava);
134	if (binJava.isFile() && binJava.getName().matches("java([.]exe)?") && binJava.getParentFile().getName().equals("bin")) {
135	String jdkhome = binJava.getParentFile().getParent();
136	opt = Utilities.escapeParameters(new String[] {"--jdkhome", jdkhome});
137	LOG.log(Level.FINE, "from {0} escaped {1}", new Object[] {jdkhome, opt});
138	}
139	}
140	value = value.replace(PROFILER_JDKHOME_OPT, opt);
141	config.setProperty(key, value.trim());
142	}
143	}	171	}
		172
		173	Map<String, String> sProps = session.getProperties();
		174	if (sProps == null) return false;
144		175
		176	props.putAll(sProps);
		177
		178	session.setAttribute("mvn-run-checker.config", config);
		179
		180	final ProfilerLauncher.Session s = session;
145	// Attach profiler engine (in separate thread) to profiled process	181	// Attach profiler engine (in separate thread) to profiled process
146	RequestProcessor.getDefault().post(new Runnable() {	182	RequestProcessor.getDefault().post(new Runnable() {
147	public void run() {	183	public void run() {
148	ProfilingSettings ps = profilingSettings.get(project);	184	Profiler.getDefault().connectToStartedApp(s.getProfilingSettings(), s.getSessionSettings());
149	SessionSettings ss = sessionSettings.get(project);
150	Profiler.getDefault().connectToStartedApp(ps, ss);
151	}	185	}
152	});	186	});
153
154	// } else if (ACTION_PROFILE_SINGLE.equals(actionName)) { // action "profile-single"
155	// // profile-single not supported yet, shouldn't get here
156	// } else if (ACTION_PROFILE_TESTS.equals(actionName)) {
157	// // profile-tests not supported yet, shouldn't get here // action "profile-tests"
158	}	187	}
159		188
160	return true;	189	return true;
161	}	190	}
162		191
163	private String profilerArgs(Properties sessionProperties, boolean prefixed) {	192	private String profilerArgs(Map<String, String> sessionProperties, boolean prefixed) {
164	List<String> args = new ArrayList<String>();	193	List<String> args = new ArrayList<String>();
165	String jvmargs = sessionProperties.getProperty("profiler.info.jvmargs");	194	String jvmargs = sessionProperties.get("profiler.info.jvmargs");
166	for (String arg : Utilities.parseParameters(jvmargs)) {	195	for (String arg : Utilities.parseParameters(jvmargs)) {
167	args.add(prefixed ? "-J" + arg : arg);	196	args.add(prefixed ? "-J" + arg : arg);
168	}	197	}
169	String agentarg = sessionProperties.getProperty("profiler.info.jvmargs.agent");	198	String agentarg = sessionProperties.get("agent.jvmargs");
170	if (Utilities.isWindows()) {	199	if (Utilities.isWindows()) {
171	agentarg = agentarg.replace('\\', '/'); // XXX is this still necessary given quoting?	200	agentarg = agentarg.replace('\\', '/'); // XXX is this still necessary given quoting?
172	}	201	}

Lines 914-921 Link Here

(-)a/nbbuild/build.xml (-6 / +16 lines)
914	<property name="debug.server" value="n"/>	914	<property name="debug.server" value="n"/>
915	<antcall target="tryme"/>	915	<antcall target="tryme"/>
916	</target>	916	</target>
917		917
918	<target name="tryme-profile" depends="-jdk-presetdef-nbprofiledirect" description="Start IDE in debugger. May only be called from within IDE.">	918	<target name="-profile-check" if="netbeans.home">
		919	<condition property="profiler.configured">
		920	<or>
		921	<contains string="${run.args.ide}" substring="-agentpath:" casesensitive="false"/>
		922	<contains string="${run.args.ide}" substring="-javaagent:" casesensitive="false"/>
		923	</or>
		924	</condition>
		925	</target>
		926
		927	<target name="-tryme-profile-pre72" depends="-jdk-presetdef-nbprofiledirect" if="profiler.info.jvmargs.agent" description="Start IDE in profiler (pre72 compatibility mode). May only be called from within IDE.">
919	<property name="profiler.roots.path" value="profiler.roots.all" />	928	<property name="profiler.roots.path" value="profiler.roots.all" />
920	<fileset id="profiler.roots.all" dir="${netbeans.dest.dir}">	929	<fileset id="profiler.roots.all" dir="${netbeans.dest.dir}">
921	<include name="*/.jar"/>	930	<include name="*/.jar"/>
Lines 934-943 Link Here
934	<fileset refid="${profiler.roots.path}" />	943	<fileset refid="${profiler.roots.path}" />
935	</rootspath>	944	</rootspath>
936	</nbprofiledirect>	945	</nbprofiledirect>
937		946	</target>
938	<antcall target="tryme">	947
939	<param name="tryme.debug.args" value="${profiler.jvmargs}"/>	948	<target name="tryme-profile" depends="-profile-check,-tryme-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent" description="Start IDE in profiler. May only be called from within IDE.">
940	</antcall>	949	<startprofiler/>
		950	<antcall target="tryme"/>
941	</target>	951	</target>
942		952
943	<target name="tryme" depends="-load-build-properties,tryme-setup-debug-args,-jdk-init"	953	<target name="tryme" depends="-load-build-properties,tryme-setup-debug-args,-jdk-init"

Lines 41-46 Link Here

(-)a/profiler.api/src/org/netbeans/modules/profiler/spi/project/ProjectProfilingSupportProvider.java (-2 / +3 lines)
41	*/	41	*/
42	package org.netbeans.modules.profiler.spi.project;	42	package org.netbeans.modules.profiler.spi.project;
43		43
		44	import java.util.Map;
44	import java.util.Properties;	45	import java.util.Properties;
45	import org.netbeans.lib.profiler.common.SessionSettings;	46	import org.netbeans.lib.profiler.common.SessionSettings;
46	import org.netbeans.modules.profiler.api.JavaPlatform;	47	import org.netbeans.modules.profiler.api.JavaPlatform;
Lines 103-109 Link Here
103	* @param props properties	104	* @param props properties
104	* @param profiledClassFile profiled file or null for profiling the entire project	105	* @param profiledClassFile profiled file or null for profiling the entire project
105	*/	106	*/
106	public abstract void configurePropertiesForProfiling(Properties props, FileObject profiledClassFile);	107	public abstract void configurePropertiesForProfiling(Map<String, String> props, FileObject profiledClassFile);
107		108
108	/**	109	/**
109	* Configures project-specific session settings.	110	* Configures project-specific session settings.
Lines 175-181 Link Here
175	}	176	}
176		177
177	@Override	178	@Override
178	public void configurePropertiesForProfiling(Properties props, FileObject profiledClassFile) {	179	public void configurePropertiesForProfiling(Map<String, String> props, FileObject profiledClassFile) {
179	}	180	}
180		181
181	@Override	182	@Override

Lines 42-58 Link Here

(-)a/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormProjectProfilingSupportProvider.java (-6 / +33 lines)
42	*/	42	*/
43	package org.netbeans.modules.profiler.freeform;	43	package org.netbeans.modules.profiler.freeform;
44		44
		45	import java.util.Map;
45	import org.netbeans.api.project.Project;	46	import org.netbeans.api.project.Project;
46	import org.netbeans.api.project.ProjectUtils;	47	import org.netbeans.api.project.ProjectUtils;
47	import org.openide.filesystems.FileObject;	48	import org.openide.filesystems.FileObject;
48	import org.openide.filesystems.FileUtil;	49	import org.openide.filesystems.FileUtil;
49	import org.w3c.dom.Element;	50	import org.w3c.dom.Element;
50	import java.util.Properties;	51	import org.netbeans.modules.ant.freeform.spi.ProjectAccessor;
		52	import org.netbeans.modules.profiler.api.JavaPlatform;
51	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;	53	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;
52	import org.netbeans.modules.profiler.nbimpl.project.JavaProjectProfilingSupportProvider;	54	import org.netbeans.modules.profiler.nbimpl.project.JavaProjectProfilingSupportProvider;
53	import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;	55	import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;
54	import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;	56	import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;
55	import org.netbeans.spi.project.ProjectServiceProvider;	57	import org.netbeans.spi.project.ProjectServiceProvider;
		58	import org.netbeans.spi.project.support.ant.EditableProperties;
56		59
57	/**	60	/**
58	* A class providing basic support for profiling free-form projects.	61	* A class providing basic support for profiling free-form projects.
Lines 62-67 Link Here
62	@ProjectServiceProvider(service=org.netbeans.modules.profiler.spi.project.ProjectProfilingSupportProvider.class,	65	@ProjectServiceProvider(service=org.netbeans.modules.profiler.spi.project.ProjectProfilingSupportProvider.class,
63	projectTypes={@ProjectType(id="org-netbeans-modules-ant-freeform", position=1210)}) // NOI18N	66	projectTypes={@ProjectType(id="org-netbeans-modules-ant-freeform", position=1210)}) // NOI18N
64	public final class FreeFormProjectProfilingSupportProvider extends JavaProjectProfilingSupportProvider {	67	public final class FreeFormProjectProfilingSupportProvider extends JavaProjectProfilingSupportProvider {
		68	private static final String NBJDK_PROPERTIES = "nbproject/nbjdk.properties"; // NOI18N
		69	private static final String NBJDK_ACTIVE = "nbjdk.active"; // NOI18N
65		70
66	@Override	71	@Override
67	public boolean checkProjectIsModifiedForProfiler() {	72	public boolean checkProjectIsModifiedForProfiler() {
Lines 85-91 Link Here
85	}	90	}
86		91
87	@Override	92	@Override
88	public void configurePropertiesForProfiling(final Properties props, final FileObject profiledClassFile) {	93	public void configurePropertiesForProfiling(final Map<String, String> props, final FileObject profiledClassFile) {
89	if (profiledClassFile != null) { // In case the class to profile is explicitely selected (profile-single)	94	if (profiledClassFile != null) { // In case the class to profile is explicitely selected (profile-single)
90	// 1. specify profiled class name	95	// 1. specify profiled class name
91		96
Lines 93-111 Link Here
93	JavaProfilerSource src = JavaProfilerSource.createFrom(profiledClassFile);	98	JavaProfilerSource src = JavaProfilerSource.createFrom(profiledClassFile);
94	if (src != null) {	99	if (src != null) {
95	final String profiledClass = src.getTopLevelClass().getQualifiedName();	100	final String profiledClass = src.getTopLevelClass().getQualifiedName();
96	props.setProperty("profile.class", profiledClass); //NOI18N	101	props.put("profile.class", profiledClass); //NOI18N
97		102
98	// 2. include it in javac.includes so that the compile-single picks it up	103	// 2. include it in javac.includes so that the compile-single picks it up
99	final String clazz = FileUtil.getRelativePath(ProjectUtilities.getRootOf(ProjectUtilities.getSourceRoots(getProject()),	104	final String clazz = FileUtil.getRelativePath(ProjectUtilities.getRootOf(ProjectUtilities.getSourceRoots(getProject()),
100	profiledClassFile), profiledClassFile);	105	profiledClassFile), profiledClassFile);
101	props.setProperty("javac.includes", clazz); //NOI18N	106	props.put("javac.includes", clazz); //NOI18N
102	}	107	}
103	}	108	}
104	}	109	}
105		110
		111	@Override
		112	public JavaPlatform resolveProjectJavaPlatform() {
		113	ProjectAccessor acc = getProject().getLookup().lookup(ProjectAccessor.class);
		114	EditableProperties ep = acc.getHelper().getProperties(NBJDK_PROPERTIES);
		115	String platformName = ep.getProperty(NBJDK_ACTIVE);
		116
		117	return getPlatformByName(platformName);
		118	}
		119
		120	@Override
		121	public boolean isProfilingSupported() {
		122	boolean supported = super.isProfilingSupported();
		123	if (!supported) return false;
		124
		125	final String WEB_MODULE_PROVIDER_TYPE = "org.netbeans.modules.web.freeform.WebModules";
		126
		127	for(Object x : getProject().getLookup().lookupAll(Object.class)) {
		128	if (WEB_MODULE_PROVIDER_TYPE.equals(x.getClass().getName())) {
		129	return false; // web freeforms are not supported
		130	}
		131	}
		132	return true;
		133	}
106		134
107	public FreeFormProjectProfilingSupportProvider(Project project) {	135	public FreeFormProjectProfilingSupportProvider(Project project) {
108	super(project);	136	super(project);
109	}	137	}
110
111	}	138	}

Lines 76-81 Link Here

(-)a/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/J2EEProjectProfilingSupportProvider.java (-24 / +25 lines)
76	import org.netbeans.modules.profiler.api.JavaPlatform;	76	import org.netbeans.modules.profiler.api.JavaPlatform;
77	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;	77	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;
78	import org.netbeans.modules.profiler.api.ProfilerDialogs;	78	import org.netbeans.modules.profiler.api.ProfilerDialogs;
		79	import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher;
79	import org.netbeans.modules.profiler.nbimpl.project.JavaProjectProfilingSupportProvider;	80	import org.netbeans.modules.profiler.nbimpl.project.JavaProjectProfilingSupportProvider;
80	import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;	81	import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;
81	import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;	82	import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;
Lines 198-204 Link Here
198	// --- ProjectTypeProfiler implementation ------------------------------------------------------------------------------	199	// --- ProjectTypeProfiler implementation ------------------------------------------------------------------------------
199		200
200	@Override	201	@Override
201	public JavaPlatform getProjectJavaPlatform() {	202	public JavaPlatform resolveProjectJavaPlatform() {
202	String serverInstanceID = getServerInstanceID(getProject());	203	String serverInstanceID = getServerInstanceID(getProject());
203		204
204	if (serverInstanceID == null) {	205	if (serverInstanceID == null) {
Lines 265-306 Link Here
265	}	266	}
266		267
267	@Override	268	@Override
268	public void configurePropertiesForProfiling(final Properties props, final FileObject profiledClassFile) {	269	public void configurePropertiesForProfiling(final Map<String, String> props, final FileObject profiledClassFile) {
269	Project project = getProject();	270	Project project = getProject();
270	initAntPlatform(project, props);	271	initAntPlatform(project, props);
271	// set forceRestart	272	// set forceRestart
272	props.setProperty("profiler.j2ee.serverForceRestart", "true"); // NOI18N	273	props.put("profiler.j2ee.serverForceRestart", "true"); // NOI18N
273	// set timeout	274	// set timeout
274		275
275	props.setProperty("profiler.j2ee.serverStartupTimeout", "300000"); // NOI18N	276	props.put("profiler.j2ee.serverStartupTimeout", "300000"); // NOI18N
276	// set agent id	277	// set agent id
277		278
278	props.setProperty("profiler.j2ee.agentID", "-Dnbprofiler.agentid=" + new Integer(generateAgentID()).toString()); // NOI18N // sets lastAgentID	279	props.put("profiler.j2ee.agentID", "-Dnbprofiler.agentid=" + new Integer(generateAgentID()).toString()); // NOI18N // sets lastAgentID
279	// redirect profiler.info.jvmargs to profiler.info.jvmargs.extra	280	// redirect profiler.info.jvmargs to profiler.info.jvmargs.extra
280	// NOTE: disabled as a workaround for Issue 102323, needs to be fixed in order to restore the OOME detection functionality!	281	// NOTE: disabled as a workaround for Issue 102323, needs to be fixed in order to restore the OOME detection functionality!
281		282
282	String jvmArgs = props.getProperty("profiler.info.jvmargs"); // NOI18N	283	String jvmArgs = props.get("profiler.info.jvmargs"); // NOI18N
283		284
284	if ((jvmArgs != null) && (jvmArgs.trim().length() > 0)) {	285	if ((jvmArgs != null) && (jvmArgs.trim().length() > 0)) {
285	props.setProperty("profiler.info.jvmargs.extra", jvmArgs);	286	props.put("profiler.info.jvmargs.extra", jvmArgs);
286	}	287	}
287		288
288	// fix agent startup arguments	289	// fix agent startup arguments
289	JavaPlatform javaPlatform = getJavaPlatformFromAntName(project, props);	290	JavaPlatform javaPlatform = getJavaPlatformFromAntName(project, props);
290	props.setProperty("profiler.info.javaPlatform", javaPlatform.getPlatformId()); // set the used platform ant property	291	props.put("profiler.java.platform", javaPlatform.getPlatformId()); // set the used platform ant property
291		292
292	String javaVersion = javaPlatform.getPlatformJDKVersion();	293	String javaVersion = javaPlatform.getPlatformJDKVersion();
293	String localPlatform = IntegrationUtils.getLocalPlatform(javaPlatform.getPlatformArchitecture());	294	String localPlatform = IntegrationUtils.getLocalPlatform(javaPlatform.getPlatformArchitecture());
294		295
295	if (javaVersion.equals(CommonConstants.JDK_15_STRING)) {	296	if (javaVersion.equals(CommonConstants.JDK_15_STRING)) {
296	// JDK 1.5 used	297	// JDK 1.5 used
297	props.setProperty("profiler.info.jvmargs.agent", // NOI18N	298	props.put("profiler.info.jvmargs.agent", // NOI18N
298	IntegrationUtils.getProfilerAgentCommandLineArgs(localPlatform, IntegrationUtils.PLATFORM_JAVA_50,	299	IntegrationUtils.getProfilerAgentCommandLineArgs(localPlatform, IntegrationUtils.PLATFORM_JAVA_50,
299	false,	300	false,
300	ProfilerIDESettings.getInstance().getPortNo()));	301	ProfilerIDESettings.getInstance().getPortNo()));
301	} else {	302	} else {
302	// JDK 1.6 or later used	303	// JDK 1.6 or later used
303	props.setProperty("profiler.info.jvmargs.agent", // NOI18N	304	props.put("profiler.info.jvmargs.agent", // NOI18N
304	IntegrationUtils.getProfilerAgentCommandLineArgs(localPlatform, IntegrationUtils.PLATFORM_JAVA_60,	305	IntegrationUtils.getProfilerAgentCommandLineArgs(localPlatform, IntegrationUtils.PLATFORM_JAVA_60,
305	false,	306	false,
306	ProfilerIDESettings.getInstance().getPortNo()));	307	ProfilerIDESettings.getInstance().getPortNo()));
Lines 310-316 Link Here
310		311
311	String loadGenPath = LoadGenPanel.hasInstance() ? LoadGenPanel.instance().getSelectedScript() : null;	312	String loadGenPath = LoadGenPanel.hasInstance() ? LoadGenPanel.instance().getSelectedScript() : null;
312	if (loadGenPath != null) {	313	if (loadGenPath != null) {
313	props.setProperty("profiler.loadgen.path", loadGenPath); // TODO factor out "profiler.loadgen.path" to a constant	314	props.put("profiler.loadgen.path", loadGenPath); // TODO factor out "profiler.loadgen.path" to a constant
314	}	315	}
315		316
316	if (profiledClassFile == null) {	317	if (profiledClassFile == null) {
Lines 359-370 Link Here
359	JavaProfilerSource src = JavaProfilerSource.createFrom(profiledClassFile);	360	JavaProfilerSource src = JavaProfilerSource.createFrom(profiledClassFile);
360	if (src != null) {	361	if (src != null) {
361	String profiledClass = src.getTopLevelClass().getQualifiedName();	362	String profiledClass = src.getTopLevelClass().getQualifiedName();
362	props.setProperty("profile.class", profiledClass); //NOI18N	363	props.put("profile.class", profiledClass); //NOI18N
363	// include it in javac.includes so that the compile-single picks it up	364	// include it in javac.includes so that the compile-single picks it up
364	final String clazz = FileUtil.getRelativePath(ProjectUtilities.getRootOf(	365	final String clazz = FileUtil.getRelativePath(ProjectUtilities.getRootOf(
365	ProjectUtilities.getSourceRoots(project),profiledClassFile),	366	ProjectUtilities.getSourceRoots(project),profiledClassFile),
366	profiledClassFile);	367	profiledClassFile);
367	props.setProperty("javac.includes", clazz); //NOI18N	368	props.put("javac.includes", clazz); //NOI18N
368	}	369	}
369	}	370	}
370		371
Lines 422-427 Link Here
422	FileUtil.toFile(project.getProjectDirectory()).getAbsolutePath()) : ""); // NOI18N	423	FileUtil.toFile(project.getProjectDirectory()).getAbsolutePath()) : ""); // NOI18N
423	ss.setJVMArgs(""); // NOI18N	424	ss.setJVMArgs(""); // NOI18N
424	ss.setWorkingDir(""); // NOI18N	425	ss.setWorkingDir(""); // NOI18N
		426
		427	super.setupProjectSessionSettings(ss);
425	}	428	}
426		429
427	@Override	430	@Override
Lines 453-460 Link Here
453	return Deployment.getDefault().getJ2eePlatform(serverInstanceID);	456	return Deployment.getDefault().getJ2eePlatform(serverInstanceID);
454	}	457	}
455		458
456	private static JavaPlatform getJavaPlatformFromAntName(Project project, Properties props) {	459	private static JavaPlatform getJavaPlatformFromAntName(Project project, Map<String, String> props) {
457	String javaPlatformAntName = props.getProperty("profiler.info.javaPlatform"); // NOI18N	460	String javaPlatformAntName = props.get("profiler.info.javaPlatform"); // NOI18N
458		461
459	if (javaPlatformAntName.equals("default_platform")) {	462	if (javaPlatformAntName.equals("default_platform")) {
460	return JavaPlatform.getDefaultPlatform();	463	return JavaPlatform.getDefaultPlatform();
Lines 468-489 Link Here
468	return (int) (Math.random() * (float) Integer.MAX_VALUE);	471	return (int) (Math.random() * (float) Integer.MAX_VALUE);
469	}	472	}
470		473
471	private static void initAntPlatform(Project project, Properties props) {	474	private void initAntPlatform(Project project, Map<String, String> props) {
472	String javaPlatformAntName = props.getProperty("profiler.info.javaPlatform"); // NOI18N	475	String javaPlatformAntName = props.get("profiler.info.javaPlatform"); // NOI18N
473		476
474	if (javaPlatformAntName == null) {	477	if (javaPlatformAntName == null) {
475	JavaPlatform platform = null;	478	JavaPlatform platform = getProjectJavaPlatform();
476	J2eePlatform j2eepf = getJ2eePlatform(project); // try to get the J2EE Platform
477	String platformId;	479	String platformId;
478		480
479	if (j2eepf == null) {	481	if (platform == null) {
480	platformId = JavaPlatform.getDefaultPlatform().getPlatformId(); // no J2EE Platform sepcified; use the IDE default JVM platform	482	platformId = JavaPlatform.getDefaultPlatform().getPlatformId(); // no Platform sepcified; use the IDE default JVM platform
481	} else {	483	} else {
482	Map<String,String> jpprops = j2eepf.getJavaPlatform().getProperties(); // use the J2EE Platform specified JVM platform	484	platformId = platform.getPlatformId();
483	platformId = jpprops.get("platform.ant.name");
484	}	485	}
485		486
486	props.setProperty("profiler.info.javaPlatform", platformId); // set the used platform ant property	487	props.put("profiler.info.javaPlatform", platformId); // set the used platform ant property
487	}	488	}
488	}	489	}
489		490

Lines 44-63 Link Here

(-)a/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEProjectProfilingSupportProvider.java (-26 / +19 lines)
44	package org.netbeans.modules.profiler.j2se;	44	package org.netbeans.modules.profiler.j2se;
45		45
46	import org.netbeans.api.project.Project;	46	import org.netbeans.api.project.Project;
47	import org.netbeans.api.project.ProjectManager;
48	import org.netbeans.lib.profiler.common.SessionSettings;	47	import org.netbeans.lib.profiler.common.SessionSettings;
49	import org.netbeans.modules.profiler.projectsupport.utilities.AppletSupport;	48	import org.netbeans.modules.profiler.projectsupport.utilities.AppletSupport;
50	import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;	49	import org.netbeans.modules.profiler.nbimpl.project.ProjectUtilities;
51	import org.netbeans.spi.project.support.ant.*;	50	import org.netbeans.spi.project.support.ant.*;
52	import org.openide.ErrorManager;
53	import org.openide.filesystems.FileObject;	51	import org.openide.filesystems.FileObject;
54	import org.openide.filesystems.FileUtil;	52	import org.openide.filesystems.FileUtil;
55	import org.openide.modules.InstalledFileLocator;
56	import java.io.*;	53	import java.io.*;
57	import java.net.URL;	54	import java.net.URL;
58	import java.util.Map;	55	import java.util.Map;
59	import java.util.Properties;	56	import java.util.Properties;
		57	import java.util.logging.Level;
		58	import java.util.logging.Logger;
60	import javax.swing.event.ChangeListener;	59	import javax.swing.event.ChangeListener;
		60	import org.netbeans.api.project.ProjectManager;
61	import org.netbeans.modules.profiler.api.JavaPlatform;	61	import org.netbeans.modules.profiler.api.JavaPlatform;
62	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;	62	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;
63	import org.netbeans.modules.profiler.api.java.ProfilerTypeUtils;	63	import org.netbeans.modules.profiler.api.java.ProfilerTypeUtils;
Lines 65-70 Link Here
65	import org.netbeans.modules.profiler.spi.project.ProjectProfilingSupportProvider;	65	import org.netbeans.modules.profiler.spi.project.ProjectProfilingSupportProvider;
66	import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;	66	import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;
67	import org.netbeans.spi.project.ProjectServiceProvider;	67	import org.netbeans.spi.project.ProjectServiceProvider;
		68	import org.openide.modules.InstalledFileLocator;
68		69
69		70
70	/**	71	/**
Lines 74-80 Link Here
74	@ProjectServiceProvider(service=ProjectProfilingSupportProvider.class,	75	@ProjectServiceProvider(service=ProjectProfilingSupportProvider.class,
75	projectTypes={@ProjectType(id="org-netbeans-modules-java-j2seproject",position=550)}) // NOI18N	76	projectTypes={@ProjectType(id="org-netbeans-modules-java-j2seproject",position=550)}) // NOI18N
76	public class J2SEProjectProfilingSupportProvider extends JavaProjectProfilingSupportProvider {	77	public class J2SEProjectProfilingSupportProvider extends JavaProjectProfilingSupportProvider {
77	//~ Inner Classes ------------------------------------------------------------------------------------------------------------	78	final private static Logger LOG = Logger.getLogger(J2SEProjectProfilingSupportProvider.class.getName());
78		79
79	private static class MyPropertyProvider implements PropertyProvider {	80	private static class MyPropertyProvider implements PropertyProvider {
80	//~ Instance fields ------------------------------------------------------------------------------------------------------	81	//~ Instance fields ------------------------------------------------------------------------------------------------------
Lines 100-111 Link Here
100	}	101	}
101	}	102	}
102		103
103	//~ Static fields/initializers -----------------------------------------------------------------------------------------------
104
105	// -----
106	// I18N String constants // -----
107	public static final ErrorManager err = ErrorManager.getDefault().getInstance("org.netbeans.modules.profiler.j2se"); // NOI18N
108
109	//~ Instance fields ----------------------------------------------------------------------------------------------------------	104	//~ Instance fields ----------------------------------------------------------------------------------------------------------
110	private String mainClassSetManually = null; // used for case when the main class is not set in project and user is prompted for it	105	private String mainClassSetManually = null; // used for case when the main class is not set in project and user is prompted for it
111		106
Lines 120-126 Link Here
120	}	115	}
121		116
122	@Override	117	@Override
123	public JavaPlatform getProjectJavaPlatform() {	118	public JavaPlatform resolveProjectJavaPlatform() {
124	PropertyEvaluator props = getProjectProperties(getProject());	119	PropertyEvaluator props = getProjectProperties(getProject());
125	String platformName = props.getProperty("platform.active"); // NOI18N	120	String platformName = props.getProperty("platform.active"); // NOI18N
126		121
Lines 128-137 Link Here
128	return null; // not provided for some reason	123	return null; // not provided for some reason
129	}	124	}
130		125
131	if (platformName.equals("default_platform")) { // NOI18N
132	return JavaPlatform.getDefaultPlatform();
133	}
134
135	return JavaPlatform.getJavaPlatformById(platformName);	126	return JavaPlatform.getJavaPlatformById(platformName);
136	}	127	}
137		128
Lines 167-173 Link Here
167	}	158	}
168		159
169	@Override	160	@Override
170	public void configurePropertiesForProfiling(final Properties props, final FileObject profiledClassFile) {	161	public void configurePropertiesForProfiling(final Map<String, String> props, final FileObject profiledClassFile) {
171	if (profiledClassFile == null) {	162	if (profiledClassFile == null) {
172	if (mainClassSetManually != null) {	163	if (mainClassSetManually != null) {
173	props.put("main.class", mainClassSetManually); // NOI18N	164	props.put("main.class", mainClassSetManually); // NOI18N
Lines 182-188 Link Here
182	if (src != null) {	173	if (src != null) {
183	Project project = getProject();	174	Project project = getProject();
184	if (src.isApplet()) {	175	if (src.isApplet()) {
185	String jvmargs = props.getProperty("run.jvmargs"); // NOI18N	176	String jvmargs = props.get("run.jvmargs"); // NOI18N
186		177
187	URL url = null;	178	URL url = null;
188		179
Lines 198-208 Link Here
198	AppletSupport.generateSecurityPolicy(project.getProjectDirectory(), buildFolder);	189	AppletSupport.generateSecurityPolicy(project.getProjectDirectory(), buildFolder);
199		190
200	if ((jvmargs == null) \|\| (jvmargs.length() == 0)) {	191	if ((jvmargs == null) \|\| (jvmargs.length() == 0)) {
201	props.setProperty("run.jvmargs",	192	props.put("run.jvmargs",
202	"-Djava.security.policy=" + FileUtil.toFile(buildFolder).getPath() + File.separator	193	"-Djava.security.policy=" + FileUtil.toFile(buildFolder).getPath() + File.separator
203	+ "applet.policy"); //NOI18N	194	+ "applet.policy"); //NOI18N
204	} else {	195	} else {
205	props.setProperty("run.jvmargs",	196	props.put("run.jvmargs",
206	jvmargs + " -Djava.security.policy=" + FileUtil.toFile(buildFolder).getPath()	197	jvmargs + " -Djava.security.policy=" + FileUtil.toFile(buildFolder).getPath()
207	+ File.separator + "applet.policy"); //NOI18N	198	+ File.separator + "applet.policy"); //NOI18N
208	}	199	}
Lines 218-233 Link Here
218	return; // TODO: fail?	209	return; // TODO: fail?
219	}	210	}
220		211
221	props.setProperty("applet.url", url.toString()); // NOI18N	212	props.put("applet.url", url.toString()); // NOI18N
222	} else {	213	} else {
223	final String profiledClass = src.getTopLevelClass().getQualifiedName();	214	final String profiledClass = src.getTopLevelClass().getQualifiedName();
224	props.setProperty("profile.class", profiledClass); //NOI18N	215	props.put("profile.class", profiledClass); //NOI18N
225	}	216	}
226		217
227	// 2. include it in javac.includes so that the compile-single picks it up	218	// 2. include it in javac.includes so that the compile-single picks it up
228	final String clazz = FileUtil.getRelativePath(ProjectUtilities.getRootOf(ProjectUtilities.getSourceRoots(project),	219	final String clazz = FileUtil.getRelativePath(ProjectUtilities.getRootOf(ProjectUtilities.getSourceRoots(project),
229	profiledClassFile), profiledClassFile);	220	profiledClassFile), profiledClassFile);
230	props.setProperty("javac.includes", clazz); //NOI18N	221	props.put("javac.includes", clazz); //NOI18N
231	}	222	}
232	}	223	}
233	}	224	}
Lines 252-257 Link Here
252		243
253	String jvmArgs = pp.getProperty("run.jvmargs"); // NOI18N	244	String jvmArgs = pp.getProperty("run.jvmargs"); // NOI18N
254	ss.setJVMArgs((jvmArgs != null) ? jvmArgs : ""); // NOI18N	245	ss.setJVMArgs((jvmArgs != null) ? jvmArgs : ""); // NOI18N
		246
		247	super.setupProjectSessionSettings(ss);
255	}	248	}
256		249
257	@Override	250	@Override
Lines 294-300 Link Here
294	is.close();	287	is.close();
295	}	288	}
296	} catch (IOException e) {	289	} catch (IOException e) {
297	err.notify(ErrorManager.INFORMATIONAL, e);	290	LOG.log(Level.INFO, null, e);
298	}	291	}
299	}	292	}
300		293
Lines 308-314 Link Here
308	is.close();	301	is.close();
309	}	302	}
310	} catch (IOException e) {	303	} catch (IOException e) {
311	err.notify(ErrorManager.INFORMATIONAL, e);	304	LOG.log(Level.INFO, null, e);
312	}	305	}
313	}	306	}
314		307
Lines 322-328 Link Here
322	is.close();	315	is.close();
323	}	316	}
324	} catch (IOException e) {	317	} catch (IOException e) {
325	err.notify(ErrorManager.INFORMATIONAL, e);	318	LOG.log(Level.INFO, null, e);
326	}	319	}
327	}	320	}
328		321
Lines 352-358 Link Here
352	is.close();	345	is.close();
353	}	346	}
354	} catch (IOException e) {	347	} catch (IOException e) {
355	err.notify(ErrorManager.INFORMATIONAL, e);	348	LOG.log(Level.INFO, null, e);
356	}	349	}
357	}	350	}
358	}	351	}

Lines 1-159 Link Here

(-)a/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/ant/NBProfileAttachTask.java (-159 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* Contributor(s):
28	* The Original Software is NetBeans. The Initial Developer of the Original
29	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
30	* Microsystems, Inc. All Rights Reserved.
31	*
32	* If you wish your version of this file to be governed by only the CDDL
33	* or only the GPL Version 2, indicate your decision by adding
34	* "[Contributor] elects to include this software in this distribution
35	* under the [CDDL or GPL Version 2] license." If you do not indicate a
36	* single choice of license, a recipient has the option to distribute
37	* your version of this file under either the CDDL, the GPL Version 2 or
38	* to extend the choice of license to its licensees as provided above.
39	* However, if you add GPL Version 2 code and therefore, elected the GPL
40	* Version 2 license, then the option applies only if the new code is
41	* made subject to such option by the copyright holder.
42	*/
43
44	package org.netbeans.modules.profiler.ant;
45
46	import org.apache.tools.ant.BuildException;
47	import org.apache.tools.ant.Project;
48	import org.apache.tools.ant.Task;
49	import org.apache.tools.ant.types.Path;
50	import org.netbeans.api.project.ProjectManager;
51	import org.netbeans.lib.profiler.common.AttachSettings;
52	import org.netbeans.lib.profiler.common.Profiler;
53	import org.netbeans.lib.profiler.common.ProfilingSettings;
54	import org.netbeans.modules.profiler.NetBeansProfiler;
55	import org.openide.filesystems.FileObject;
56	import org.openide.filesystems.FileUtil;
57	import java.io.File;
58	import java.io.IOException;
59	import java.util.Hashtable;
60	import javax.swing.*;
61
62
63	/** Ant task to start the NetBeans profiler attach action.
64	*
65	* @author Tomas Hurka
66	* @author Ian Formanek
67	*/
68	public final class NBProfileAttachTask extends Task {
69	//~ Instance fields ----------------------------------------------------------------------------------------------------------
70
71	/** Explicit classpath of the profiled process. */
72	private Path classpath = null;
73	private String port = null;
74	private boolean direct = true;
75	private boolean directDefinedExplicitely = false;
76
77	//~ Methods ------------------------------------------------------------------------------------------------------------------
78
79	public void setDirect(final boolean aos) {
80	this.direct = aos;
81	directDefinedExplicitely = true;
82	}
83
84	public void setPort(final String port) {
85	this.port = port;
86	}
87
88	// properties -----------------------------------------------------------------
89
90	/** "classpath" subelements, only one is allowed
91	* @param path the classpath
92	*/
93	public void addClasspath(final Path path) {
94	if (classpath != null) {
95	throw new BuildException("Only one classpath subelement is supported"); //NOI18N
96	}
97
98	classpath = path;
99	}
100
101	// main methods ---------------------------------------------------------------
102	public void execute() throws BuildException {
103	Project antProject = getProject();
104	final Hashtable props = antProject.getProperties();
105	final ProfilingSettings ps = new ProfilingSettings();
106
107	// 1. process parameters passed via Properties
108	ps.load(props);
109
110	final AttachSettings as = new AttachSettings();
111	as.load(antProject.getProperties());
112
113	// 2. Process those passed as attributes/elements from the buildl script
114	if (directDefinedExplicitely) {
115	as.setDirect(Boolean.valueOf(direct).booleanValue());
116	}
117
118	if (port != null) {
119	try {
120	final int portNo = Integer.parseInt(port);
121	as.setPort(portNo);
122	} catch (NumberFormatException e) {
123	} // ignore, will not be used
124	}
125
126	// 3. log used properties in verbose level
127	antProject.log("Attaching to Profiled Application", Project.MSG_VERBOSE); //NOI18N
128	antProject.log(" classpath: " + classpath, Project.MSG_VERBOSE); //NOI18N
129	antProject.log(" attach direct: " + as.isDirect(), Project.MSG_VERBOSE); //NOI18N
130	antProject.log(" remote attach: " + as.isRemote(), Project.MSG_VERBOSE); //NOI18N
131	antProject.log(" remote host: " + as.getHost(), Project.MSG_VERBOSE); //NOI18N
132	antProject.log(" profiler port: " + as.getPort(), Project.MSG_VERBOSE); //NOI18N
133
134	// 4. log profiling and session settings in debug level
135	antProject.log(" profiling settings: " + ps.debug(), Project.MSG_DEBUG); //NOI18N
136	antProject.log(" attach settings: " + as.debug(), Project.MSG_DEBUG); //NOI18N
137
138	// 5. determine project being profiled
139	org.netbeans.api.project.Project profiledProject = null;
140
141	String projectDir = (String) props.get("profiler.info.project.dir"); //NOI18N
142
143	if (projectDir != null) {
144	FileObject projectFO = FileUtil.toFileObject(FileUtil.normalizeFile(new File(projectDir)));
145
146	if (projectFO != null) {
147	try {
148	profiledProject = ProjectManager.getDefault().findProject(projectFO);
149	} catch (IOException e) {
150	antProject.log("Could not determine project: " + e.getMessage(), Project.MSG_WARN); //NOI18N
151	}
152	}
153	}
154
155	// 6. invoke profiling with constructed profiling and attach settings
156	((NetBeansProfiler) Profiler.getDefault()).setProfiledProject(profiledProject, null);
157	Profiler.getDefault().attachToApp(ps, as);
158	}
159	}

Line 0 Link Here

(-)a/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/StartProfilerTask.java (+96 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.modules.profiler.nbimpl;
		43
		44	import java.io.File;
		45	import java.util.Map;
		46	import org.apache.tools.ant.BuildException;
		47	import org.apache.tools.ant.Task;
		48	import org.netbeans.api.project.FileOwnerQuery;
		49	import org.netbeans.api.project.Project;
		50	import org.netbeans.lib.profiler.common.Profiler;
		51	import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher;
		52	import org.openide.filesystems.FileUtil;
		53
		54	/**
		55	*
		56	* @author Jaroslav Bachorik
		57	*/
		58	public class StartProfilerTask extends Task {
		59	private String freeformStr = "";
		60	private boolean isFreeForm = false;
		61
		62	@Override
		63	public void execute() throws BuildException {
		64	ProfilerLauncher.Session s = ProfilerLauncher.getLastSession();
65	if (s == null && isFreeForm) {
66	File baseDir = getProject().getBaseDir();
67	if (baseDir != null) {
68	Project p = FileOwnerQuery.getOwner(FileUtil.toFileObject(baseDir));
69	if (p != null) {
70	s = ProfilerLauncher.Session.createSession(p);
71	}
72	}
73
74	}
75	if (s != null) {
76	Map<String, String> props = s.getProperties();
77	if (props != null) {
78	for(Map.Entry<String, String> e : props.entrySet()) {
79	getProject().setProperty(e.getKey(), e.getValue());
80	}
81	NetBeansProfiler.getDefaultNB().setupDispatcher(s.getProfilingSettings());
82	Profiler.getDefault().connectToStartedApp(s.getProfilingSettings(), s.getSessionSettings());
83	getProject().setProperty("profiler.configured", "true"); // NOI18N
84	}
85	}
86	}
87
88	public void setFreeform(String val) {
89	freeformStr = val;
90	isFreeForm = Boolean.parseBoolean(val);
91	}
92
93	public String getFreeform() {
94	return freeformStr;
95	}
96	}

Lines 2-8 Link Here

(-)a/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/antlib.xml (-4 / +3 lines)
2	<!--	2	<!--
3	DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.	3	DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4		4
5	Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.	5	Copyright 2010 Oracle and/or its affiliates. All rights reserved.
6		6
7	Oracle and Java are registered trademarks of Oracle and/or its affiliates.	7	Oracle and Java are registered trademarks of Oracle and/or its affiliates.
8	Other names may be trademarks of their respective owners.	8	Other names may be trademarks of their respective owners.
Lines 29-35 Link Here
29	Contributor(s):	29	Contributor(s):
30		30
31	The Original Software is NetBeans. The Initial Developer of the Original	31	The Original Software is NetBeans. The Initial Developer of the Original
32	Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun	32	Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun
33	Microsystems, Inc. All Rights Reserved.	33	Microsystems, Inc. All Rights Reserved.
34		34
35	If you wish your version of this file to be governed by only the CDDL	35	If you wish your version of this file to be governed by only the CDDL
Lines 44-49 Link Here
44	made subject to such option by the copyright holder.	44	made subject to such option by the copyright holder.
45	-->	45	-->
46	<antlib>	46	<antlib>
47	<taskdef name="nbprofileattach" classname="org.netbeans.modules.profiler.ant.NBProfileAttachTask"/>	47	<taskdef name="startprofiler" classname="org.netbeans.modules.profiler.nbimpl.StartProfilerTask"/>
48	<taskdef name="nbprofiledirect" classname="org.netbeans.modules.profiler.ant.NBProfileDirectTask"/>
49	</antlib>	48	</antlib>

Line 0 Link Here

(-)a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProjectSensitivePerformer.java (+97 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2011 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2011 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.modules.profiler.nbimpl.actions;
		43
		44	import org.netbeans.api.project.Project;
		45	import org.netbeans.lib.profiler.common.Profiler;
		46	import org.netbeans.modules.profiler.api.project.ProjectProfilingSupport;
		47	import org.netbeans.modules.profiler.nbimpl.NetBeansProfiler;
		48	import org.netbeans.modules.profiler.nbimpl.actions.ProfilerLauncher.Session;
		49	import org.netbeans.spi.project.ActionProvider;
		50	import org.netbeans.spi.project.ui.support.ProjectActionPerformer;
		51	import org.openide.util.Lookup;
		52	import org.openide.util.lookup.Lookups;
		53	import org.openide.util.lookup.ProxyLookup;
		54
		55	/**
		56	*
		57	* @author Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
		58	*/
		59	public class ProjectSensitivePerformer implements ProjectActionPerformer {
		60	final private String command;
		61
		62	public ProjectSensitivePerformer(String command) {
		63	this.command = command;
		64	}
65
66	@Override
67	public boolean enable(Project project) {
68	if (project == null) return false;
69
70	ActionProvider ap = project.getLookup().lookup(ActionProvider.class);
71	try {
72	if (ap != null && ap.isActionEnabled(command, project.getLookup())) {
73	ProjectProfilingSupport ppp = ProjectProfilingSupport.get(project);
74	if (ppp == null) {
75	return false;
76	}
77	return ppp.isProfilingSupported();
78	}
79	} catch (IllegalArgumentException e) {
80	// no provider responds to the command
81	}
82	return false;
83	}
84
85	@Override
86	public void perform(final Project project) {
87	final ActionProvider ap = project.getLookup().lookup(ActionProvider.class);
88	if (ap != null) {
89	Lookup ctx = new ProxyLookup(project.getLookup(), Lookups.fixed(project));
90
91	Session s = ProfilerLauncher.newSession(command, ctx);
92	if (s != null) {
93	s.run();
94	}
95	}
96	}
97	}

Lines 57-134 Link Here

(-)a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/layer.xml (-106 lines)
57	</folder>	57	</folder>
58	</folder>	58	</folder>
59	</folder>	59	</folder>
60
61	<folder name="Projects">
62	<folder name="Profiler_Actions_temporary">
63	<file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.shadow">
64	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.instance"/>
65	</file>
66	</folder>
67	</folder>
68
69	<folder name="Loaders">
70	<folder name="text">
71	<folder name="x-java">
72	<folder name="Actions">
73	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.shadow">
74	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.instance"/>
75	<attr name="position" intvalue="1200"/>
76	</file>
77	</folder>
78	</folder>
79	<folder name="x-jsp">
80	<folder name="Actions">
81	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.shadow">
82	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.instance"/>
83	<attr name="position" intvalue="800"/>
84	</file>
85	</folder>
86	</folder>
87	<folder name="x-fx">
88	<folder name="Actions">
89	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.shadow">
90	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.instance"/>
91	<attr name="position" intvalue="660"/>
92	</file>
93	</folder>
94	</folder>
95	</folder>
96	</folder>
97
98	<folder name="Menu">
99	<folder name="Profile">
100	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.shadow">
101	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.instance"/>
102	<attr name="position" intvalue="100"/>
103	</file>
104	<folder name="ProfileOther">
105	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.profiler.nbimpl.actions.Bundle"/>
106	<attr name="position" intvalue="300"/>
107	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileProjectAction.shadow">
108	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileProjectAction.instance"/>
109	<attr name="position" intvalue="100"/>
110	</file>
111	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleAction.shadow">
112	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleAction.instance"/>
113	<attr name="position" intvalue="200"/>
114	</file>
115	<attr boolvalue="true" name="org-netbeans-modules-profiler-nbimpl-actions-ProfileProjectAction.instance"/>
116	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileTestAction.shadow">
117	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileTestAction.instance"/>
118	<attr name="position" intvalue="300"/>
119	</file>
120	</folder>
121	<folder name="Advanced">
122	<file name="org-netbeans-modules-profiler-nbimpl-actions-UnintegrateProfilerAction.shadow">
123	<attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.unintegrateProfiler"/>
124	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-UnintegrateProfilerAction.instance"/>
125	<attr name="position" intvalue="500"/>
126	</file>
127	</folder>
128
129	<attr boolvalue="true" name="org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.instance"/>
130	</folder>
131	</folder>
132		60
133	<folder name="Toolbars">	61	<folder name="Toolbars">
134	<folder name="Build">	62	<folder name="Build">
Lines 138-175 Link Here
138	</file>	66	</file>
139	</folder>	67	</folder>
140	</folder>	68	</folder>
141
142	<folder name="Shortcuts">
143	<file name="A-F2.shadow">
144	<attr name="originalFile" stringvalue="Actions/Profile/org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.instance"/>
145	</file>
146	</folder>
147
148	<folder name="Actions">
149	<folder name="Profile">
150	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleAction.instance">
151	<attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileSingle"/>
152	</file>
153	<!-- XXX impl is nearly the same, really just different label... should probably share an Action instance -->
154	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileSingleActionPopup.instance">
155	<attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileSinglePopup"/>
156	</file>
157	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileTestAction.instance">
158	<attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileTest"/>
159	</file>
160	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileProjectAction.instance">
161	<attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileProject"/>
162	</file>
163	<file name="org-netbeans-modules-profiler-nbimpl-actions-ProfileMainProjectAction.instance">
164	<attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileMainProject"/>
165	</file>
166	<file name="org-netbeans-modules-profiler-actions-ProfileProjectActionPopup.instance">
167	<attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.profileProjectPopup"/>
168	</file>
169	<file name="org-netbeans-modules-profiler-nbimpl-actions-UnintegrateProfilerAction.instance">
170	<attr name="instanceCreate" methodvalue="org.netbeans.modules.profiler.nbimpl.actions.AntActions.unintegrateProfiler"/>
171	</file>
172	</folder>
173	</folder>
174
175	</filesystem>	69	</filesystem>

Lines 52-63 Link Here

(-)a/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/NbModuleProjectProfilingSupportProvider.java (-8 / +20 lines)
52	import org.openide.util.Utilities;	52	import org.openide.util.Utilities;
53	import org.w3c.dom.Element;	53	import org.w3c.dom.Element;
54	import java.util.List;	54	import java.util.List;
55	import java.util.Properties;	55	import java.util.Map;
56	import java.util.Set;	56	import java.util.Set;
57	import org.netbeans.api.java.platform.JavaPlatformManager;	57	import org.netbeans.api.java.platform.JavaPlatformManager;
58	import org.netbeans.api.java.platform.Specification;	58	import org.netbeans.api.java.platform.Specification;
59	import org.netbeans.api.project.ProjectUtils;	59	import org.netbeans.api.project.ProjectUtils;
60	import org.netbeans.lib.profiler.common.Profiler;	60	import org.netbeans.lib.profiler.common.Profiler;
		61	import org.netbeans.lib.profiler.common.SessionSettings;
61	import org.netbeans.lib.profiler.common.integration.IntegrationUtils;	62	import org.netbeans.lib.profiler.common.integration.IntegrationUtils;
62	import org.netbeans.modules.profiler.api.JavaPlatform;	63	import org.netbeans.modules.profiler.api.JavaPlatform;
63	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;	64	import org.netbeans.modules.profiler.api.java.JavaProfilerSource;
Lines 102-108 Link Here
102	}	103	}
103		104
104	@Override	105	@Override
105	public JavaPlatform getProjectJavaPlatform() {	106	public JavaPlatform resolveProjectJavaPlatform() {
106	return getProjectJavaPlatform(getProject());	107	return getProjectJavaPlatform(getProject());
107	}	108	}
108		109
Lines 173-204 Link Here
173	}	174	}
174		175
175	@Override	176	@Override
176	public void configurePropertiesForProfiling(final Properties props, final FileObject profiledClassFile) {	177	public void configurePropertiesForProfiling(final Map<String, String> props, final FileObject profiledClassFile) {
177	// FIXME	178	// FIXME
178	JavaProfilerSource src = JavaProfilerSource.createFrom(profiledClassFile);	179	JavaProfilerSource src = JavaProfilerSource.createFrom(profiledClassFile);
179	if (src != null) {	180	if (src != null) {
180	final String profiledClass = src.getTopLevelClass().getQualifiedName();	181	final String profiledClass = src.getTopLevelClass().getQualifiedName();
181	props.setProperty("profile.class", profiledClass); //NOI18N	182	props.put("profile.class", profiledClass); //NOI18N
182	// Set for all cases (incl. Profile Project, Profile File) but should only	183	// Set for all cases (incl. Profile Project, Profile File) but should only
183	// be taken into account when profiling single test	184	// be taken into account when profiling single test
184	props.setProperty("test.type", getTestType(profiledClassFile)); //NOI18N	185	props.put("test.type", getTestType(profiledClassFile)); //NOI18N
185	}	186	}
186		187
187	String agentArg = props.getProperty("profiler.info.jvmargs.agent"); //NOI18N	188	String agentArg = props.get("agent.jvmargs"); //NOI18N
188	if (agentArg.indexOf(' ') != -1) { //NOI18N	189	if (agentArg.indexOf(' ') != -1) { //NOI18N
189	if (Utilities.isUnix()) {	190	if (Utilities.isUnix()) {
190	// Profiler is installed in directory with space on Unix (Linux, Solaris, Mac OS X)	191	// Profiler is installed in directory with space on Unix (Linux, Solaris, Mac OS X)
191	// create temporary link in /tmp directory and use it instead of directory with space	192	// create temporary link in /tmp directory and use it instead of directory with space
192	String libsDir = Profiler.getDefault().getLibsDir();	193	String libsDir = Profiler.getDefault().getLibsDir();
193	props.setProperty("profiler.info.jvmargs.agent", IntegrationUtils.fixLibsDirPath(libsDir, agentArg)); //NOI18N	194	props.put("agent.jvmargs", IntegrationUtils.fixLibsDirPath(libsDir, agentArg)); //NOI18N
194	} else if (Utilities.isWindows() && isNbSourceModule(getProject())) {	195	} else if (Utilities.isWindows() && isNbSourceModule(getProject())) {
195	// Profiler is installed in directory with space on Windows	196	// Profiler is installed in directory with space on Windows
196	// surround the whole -agentpath argument with quotes for NB source module	197	// surround the whole -agentpath argument with quotes for NB source module
197	agentArg = "\"" + agentArg + "\""; //NOI18N	198	agentArg = "\"" + agentArg + "\""; //NOI18N
198	props.setProperty("profiler.info.jvmargs.agent", agentArg); //NOI18N	199	props.put("agent.jvmargs", agentArg); //NOI18N
199	}	200	}
200	}	201	}
201	}	202	}
		203
		204	@Override
		205	public void setupProjectSessionSettings(SessionSettings ss) {
		206	JavaPlatform platform = getProjectJavaPlatform();
		207
		208	ss.setSystemArchitecture(platform.getPlatformArchitecture());
		209	ss.setJavaVersionString(platform.getPlatformJDKVersion());
		210	ss.setJavaExecutable(platform.getPlatformJavaFile());
		211	}
		212
		213
202		214
203	/**	215	/**
204	* Returns true if the provided Project is a NB source module, false otherwise.	216	* Returns true if the provided Project is a NB source module, false otherwise.

Lines 44-50 Link Here

(-)a/profiler/src/org/netbeans/modules/profiler/actions/ProfilingSupport.java (-2 / +2 lines)
44	package org.netbeans.modules.profiler.actions;	44	package org.netbeans.modules.profiler.actions;
45		45
46	import org.netbeans.lib.profiler.ProfilerLogger;	46	import org.netbeans.lib.profiler.ProfilerLogger;
47	import org.netbeans.lib.profiler.TargetAppRunner;
48	import org.netbeans.lib.profiler.common.*;	47	import org.netbeans.lib.profiler.common.*;
49	import org.netbeans.modules.profiler.NetBeansProfiler;	48	import org.netbeans.modules.profiler.NetBeansProfiler;
50	import org.netbeans.modules.profiler.ui.panels.PIDSelectPanel;	49	import org.netbeans.modules.profiler.ui.panels.PIDSelectPanel;
Lines 52-58 Link Here
52	import org.openide.util.NbBundle;	51	import org.openide.util.NbBundle;
53	import org.openide.util.RequestProcessor;	52	import org.openide.util.RequestProcessor;
54	import java.io.IOException;	53	import java.io.IOException;
55	import java.text.MessageFormat;	54	import org.netbeans.lib.profiler.TargetAppRunner;
56	import org.netbeans.modules.profiler.api.ProfilerDialogs;	55	import org.netbeans.modules.profiler.api.ProfilerDialogs;
57	import org.netbeans.modules.profiler.api.project.ProjectStorage;	56	import org.netbeans.modules.profiler.api.project.ProjectStorage;
58	import org.netbeans.modules.profiler.api.TaskConfigurator;	57	import org.netbeans.modules.profiler.api.TaskConfigurator;
Lines 76-81 Link Here
76	"ProfilingSupport_FailedLoadSettingsMsg=Failed to load attach settings: {0}"	75	"ProfilingSupport_FailedLoadSettingsMsg=Failed to load attach settings: {0}"
77	})	76	})
78	public final class ProfilingSupport {	77	public final class ProfilingSupport {
		78	public static final String RERUN_PROP = "profiler.rerun";
79	//~ Inner Classes ------------------------------------------------------------------------------------------------------------	79	//~ Inner Classes ------------------------------------------------------------------------------------------------------------
80		80
81	public static class AttachSTPData {	81	public static class AttachSTPData {

Lines 107-113 Link Here

(-)a/projectapi/apichanges.xml (-1 / +18 lines)
107	<!-- ACTUAL CHANGES BEGIN HERE: -->	107	<!-- ACTUAL CHANGES BEGIN HERE: -->
108		108
109	<changes>	109	<changes>
110		110	<change id="Profiler.Actions">
		111	<api name="general"/>
		112	<summary>Profiler actions are an integral part of the project infrastructure - just like the debugger actions</summary>
		113	<version major="1" minor="43"/>
		114	<date day="23" month="3" year="2011"/>
		115	<author login="yardus"/>
		116	<compatibility addition="yes"/>
		117	<description>
		118	<p>
		119	In order to be able to fully integrate the profiler with the project infrastructure
		120	it is necessary to add three new constants to
		121	<code>ActionProvider</code> SPI for profiling a project, profiling a single file and
		122	profiling a test for single file.
		123	</p>
		124	</description>
		125	<class package="org.netbeans.spi.project" name="ActionProvider"/>
		126	<issue number="203519"/>
		127	</change>
111	<change id="SourceGroup.contains.IAE">	128	<change id="SourceGroup.contains.IAE">
112	<api name="general"/>	129	<api name="general"/>
113	<summary><code>SourceGroup.contains</code> no longer throws <code>IllegalArgumentException</code></summary>	130	<summary><code>SourceGroup.contains</code> no longer throws <code>IllegalArgumentException</code></summary>

Lines 130-135 Link Here

(-)a/projectapi/src/org/netbeans/spi/project/ActionProvider.java (+18 lines)
130	String COMMAND_DEBUG_STEP_INTO = "debug.stepinto"; // NOI18N	130	String COMMAND_DEBUG_STEP_INTO = "debug.stepinto"; // NOI18N
131		131
132	/**	132	/**
		133	* Standard command for running the project in profiler
		134	* @since 1.43
		135	*/
		136	String COMMAND_PROFILE = "profile"; // NOI18N
		137
		138	/**
		139	* Standard command for running single file in profiler
		140	* @since 1.43
		141	*/
		142	String COMMAND_PROFILE_SINGLE = "profile.single"; // NOI18N
		143
		144	/**
		145	* Standard command for running one test in profiler
		146	* @since 1.43
		147	*/
		148	String COMMAND_PROFILE_TEST_SINGLE = "profile.test.single"; // NOI18N
		149
		150	/**
133	* Standard command for deleting the project.	151	* Standard command for deleting the project.
134	*	152	*
135	* @since 1.6	153	* @since 1.6