Attachment #134425 for bug #229459

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 229459
Collapse All | Expand All

Lines 186-192 Link Here

(-)a/gsf.testrunner/nbproject/project.xml (-1 / +1 lines)
186	<friend>org.netbeans.modules.cnd.cncppunit</friend>	186	<friend>org.netbeans.modules.cnd.cncppunit</friend>
187	<friend>org.netbeans.modules.cnd.testrunner</friend>	187	<friend>org.netbeans.modules.cnd.testrunner</friend>
188	<friend>org.netbeans.modules.groovy.support</friend>	188	<friend>org.netbeans.modules.groovy.support</friend>
189	<friend>org.netbeans.modules.hudson</friend>	189	<friend>org.netbeans.modules.hudson.ui</friend>
190	<friend>org.netbeans.modules.java.testrunner</friend>	190	<friend>org.netbeans.modules.java.testrunner</friend>
191	<friend>org.netbeans.modules.javascript.jstestdriver</friend>	191	<friend>org.netbeans.modules.javascript.jstestdriver</friend>
192	<friend>org.netbeans.modules.junit</friend>	192	<friend>org.netbeans.modules.junit</friend>

Lines 19-24 Link Here

(-)a/hudson.ant/nbproject/project.xml (+8 lines)
19	<build-prerequisite/>	19	<build-prerequisite/>
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
		22	<specification-version>2.0</specification-version>
		23	</run-dependency>
		24	</dependency>
		25	<dependency>
		26	<code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
		27	<build-prerequisite/>
		28	<compile-dependency/>
		29	<run-dependency>
22	<specification-version>1.0</specification-version>	30	<specification-version>1.0</specification-version>
23	</run-dependency>	31	</run-dependency>
24	</dependency>	32	</dependency>




import org.netbeans.modules.hudson.ant.AntBasedJobCreator.ArchivePattern;
import org.netbeans.modules.hudson.ant.AntBasedJobCreator.Configuration;
import org.netbeans.modules.hudson.ant.AntBasedJobCreator.Target;
import static org.netbeans.modules.hudson.ant.Bundle.*;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory.Helper;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory.ProjectHudsonJobCreator;
import org.netbeans.modules.hudson.spi.HudsonSCM;
import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ConfigurationStatus;
import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.Helper;
import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ProjectHudsonJobCreator;
import org.netbeans.modules.java.api.common.project.ui.customizer.ProjectSharability;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
import org.openide.util.NbBundle.Messages;
import org.openide.util.lookup.ServiceProvider;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import static org.netbeans.modules.hudson.ant.Bundle.*;
import org.openide.util.NbBundle.Messages;

public class JobCreator extends JPanel implements ProjectHudsonJobCreator {


Lines 28-34 Link Here

(-)a/hudson.git/nbproject/project.xml (-1 / +9 lines)
28	<build-prerequisite/>	28	<build-prerequisite/>
29	<compile-dependency/>	29	<compile-dependency/>
30	<run-dependency>	30	<run-dependency>
31	<specification-version>1.15</specification-version>	31	<specification-version>2.0</specification-version>
		32	</run-dependency>
		33	</dependency>
		34	<dependency>
		35	<code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
		36	<build-prerequisite/>
		37	<compile-dependency/>
		38	<run-dependency>
		39	<specification-version>1.0</specification-version>
32	</run-dependency>	40	</run-dependency>
33	</dependency>	41	</dependency>
34	<dependency>	42	<dependency>




import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.Utilities;
import static org.netbeans.modules.hudson.git.Bundle.*;
import org.netbeans.modules.hudson.ui.api.HudsonSCMHelper;
import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;
import org.netbeans.modules.hudson.spi.HudsonSCM;
import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
import org.openide.util.NbBundle.Messages;
import org.openide.util.lookup.ServiceProvider;
import org.openide.windows.OutputListener;

                // Note that all this will be wrong if the local repo is using a nondefault remote, or a branch, etc. etc.
                configXmlSCM.appendChild(doc.createElement("source")).appendChild(doc.createTextNode(replacement != null ? replacement : origin.toString()));
                // XXX consider <clean>true</clean> (though it does not seem to work)
                HudsonSCMHelper.addTrigger(doc);
            }
            @Override public ConfigurationStatus problems() {
                if (origin == null) {

Lines 10-15 Link Here

(-)a/hudson.maven/nbproject/project.xml (+8 lines)
10	<build-prerequisite/>	10	<build-prerequisite/>
11	<compile-dependency/>	11	<compile-dependency/>
12	<run-dependency>	12	<run-dependency>
		13	<specification-version>2.0</specification-version>
		14	</run-dependency>
		15	</dependency>
		16	<dependency>
		17	<code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
		18	<build-prerequisite/>
		19	<compile-dependency/>
		20	<run-dependency>
13	<specification-version>1.0</specification-version>	21	<specification-version>1.0</specification-version>
14	</run-dependency>	22	</run-dependency>
15	</dependency>	23	</dependency>

Lines 46-52 Link Here

(-)a/hudson.maven/src/org/netbeans/modules/hudson/maven/HudsonProviderImpl.java (-1 / +1 lines)
46		46
47	import java.util.Collections;	47	import java.util.Collections;
48	import org.netbeans.api.project.Project;	48	import org.netbeans.api.project.Project;
49	import org.netbeans.modules.hudson.spi.ProjectHudsonProvider;	49	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider;
50	import org.netbeans.modules.maven.api.NbMavenProject;	50	import org.netbeans.modules.maven.api.NbMavenProject;
51	import org.netbeans.modules.maven.model.ModelOperation;	51	import org.netbeans.modules.maven.model.ModelOperation;
52	import org.netbeans.modules.maven.model.Utilities;	52	import org.netbeans.modules.maven.model.Utilities;




import javax.swing.event.ChangeListener;
import org.netbeans.api.project.Project;
import org.netbeans.modules.hudson.spi.HudsonSCM;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory;
import org.netbeans.modules.maven.api.NbMavenProject;
import org.openide.util.lookup.ServiceProvider;
import org.openide.xml.XMLUtil;

                return new JPanel();
            }

            public HudsonSCM.ConfigurationStatus status() {
                if (scm == null) {
                    return ProjectHudsonJobCreatorFactory.Helper.noSCMError();
                }
                HudsonSCM.ConfigurationStatus scmStatus = scm.problems();
                if (scmStatus != null) {
                    return scmStatus;
                } else {
                    return HudsonSCM.ConfigurationStatus.valid();
                }
            }


Lines 45-51 Link Here

(-)a/hudson.maven/test/unit/src/org/netbeans/modules/hudson/maven/HudsonProviderImplTest.java (-1 / +1 lines)
45	import org.netbeans.api.project.Project;	45	import org.netbeans.api.project.Project;
46	import org.netbeans.api.project.ProjectManager;	46	import org.netbeans.api.project.ProjectManager;
47	import org.netbeans.junit.NbTestCase;	47	import org.netbeans.junit.NbTestCase;
48	import org.netbeans.modules.hudson.spi.ProjectHudsonProvider.Association;	48	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider.Association;
49	import org.netbeans.modules.maven.api.NbMavenProject;	49	import org.netbeans.modules.maven.api.NbMavenProject;
50	import org.openide.filesystems.FileObject;	50	import org.openide.filesystems.FileObject;
51	import org.openide.filesystems.FileUtil;	51	import org.openide.filesystems.FileUtil;

Lines 28-34 Link Here

(-)a/hudson.mercurial/nbproject/project.xml (-1 / +9 lines)
28	<build-prerequisite/>	28	<build-prerequisite/>
29	<compile-dependency/>	29	<compile-dependency/>
30	<run-dependency>	30	<run-dependency>
31	<specification-version>1.15</specification-version>	31	<specification-version>2.0</specification-version>
		32	</run-dependency>
		33	</dependency>
		34	<dependency>
		35	<code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
		36	<build-prerequisite/>
		37	<compile-dependency/>
		38	<run-dependency>
		39	<specification-version>1.0</specification-version>
32	</run-dependency>	40	</run-dependency>
33	</dependency>	41	</dependency>
34	<dependency>	42	<dependency>




import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;
import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile.EditType;
import org.netbeans.modules.hudson.spi.HudsonSCM;
import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
import org.netbeans.modules.hudson.ui.api.HudsonSCMHelper;
import org.openide.util.NbBundle.Messages;
import org.openide.util.lookup.ServiceProvider;
import org.openide.windows.OutputListener;

                configXmlSCM.appendChild(doc.createElement("source")).appendChild(doc.createTextNode(repo)); // NOI18N
                configXmlSCM.appendChild(doc.createElement("modules")).appendChild(doc.createTextNode("")); // NOI18N
                configXmlSCM.appendChild(doc.createElement("clean")).appendChild(doc.createTextNode("true")); // NOI18N
                HudsonSCMHelper.addTrigger(doc);
            }
            public ConfigurationStatus problems() {
                if (result.isFoundInParenFolder()) {

        } else {
            String defaultPullNoPassword = defaultPull.replaceFirst("//[^/]+(:[^/]+)?@", "//");
            try {
                return repository.resolve(stringToURI(defaultPullNoPassword));
            } catch (URISyntaxException x) {
                LOG.log(Level.FINE, "{0} is not a valid URI", defaultPullNoPassword);
                return null;

    }

    /**
     * Convert string to URI. Ensure that drive letters in paths like
     * C:/something are not used as protocol part of the URI.
     */
    private static URI stringToURI(String s) throws URISyntaxException {
        String withProtocol = org.openide.util.Utilities.isWindows()
                && s.matches("\\w:/[^/].*") //NOI18N
                ? "file:/" + s //NOI18N
                : s;
        return new URI(withProtocol);
    }

    /**
     * Result of finding the default pull. Instances of this class are created
     * by method {@link #findDefaultPull(java.io.File)}
     */




import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.netbeans.api.diff.StreamSource;
import org.netbeans.modules.hudson.ui.api.HudsonSCMHelper;
import static org.netbeans.modules.hudson.mercurial.Bundle.*;
import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile;
import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile.EditType;
import org.netbeans.modules.hudson.spi.HudsonSCM.Helper;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbBundle.Messages;
import org.openide.util.RequestProcessor;

    }

    public void outputLineAction(OutputEvent ev) {
        HudsonSCMHelper.noteWillShowDiff(file.getName());
        RP.post(new Runnable() {
            public void run() {
                try {
                    final StreamSource before = makeSource(false);
                    final StreamSource after = makeSource(true);
                    HudsonSCMHelper.showDiff(before, after, file.getName());
                } catch (IOException x) {
                    LOG.log(Level.INFO, null, x);
                }

Lines 19-25 Link Here

(-)a/hudson.php/nbproject/project.xml (-1 / +9 lines)
19	<build-prerequisite/>	19	<build-prerequisite/>
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<specification-version>1.23</specification-version>	22	<specification-version>2.0</specification-version>
		23	</run-dependency>
		24	</dependency>
		25	<dependency>
		26	<code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
		27	<build-prerequisite/>
		28	<compile-dependency/>
		29	<run-dependency>
		30	<specification-version>1.0</specification-version>
23	</run-dependency>	31	</run-dependency>
24	</dependency>	32	</dependency>
25	<dependency>	33	<dependency>

Lines 65-70 Link Here

(-)a/hudson.php/src/org/netbeans/modules/hudson/php/HudsonJobCreator.java (-4 / +4 lines)
65	import javax.swing.event.ChangeEvent;	65	import javax.swing.event.ChangeEvent;
66	import javax.swing.event.ChangeListener;	66	import javax.swing.event.ChangeListener;
67	import org.netbeans.api.project.Project;	67	import org.netbeans.api.project.Project;
		68	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory;
		69	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory.Helper;
		70	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory.ProjectHudsonJobCreator;
68	import org.netbeans.modules.hudson.php.commands.PpwScript;	71	import org.netbeans.modules.hudson.php.commands.PpwScript;
69	import org.netbeans.modules.hudson.php.options.HudsonOptions;	72	import org.netbeans.modules.hudson.php.options.HudsonOptions;
70	import org.netbeans.modules.hudson.php.options.HudsonOptionsValidator;	73	import org.netbeans.modules.hudson.php.options.HudsonOptionsValidator;
Lines 72-81 Link Here
72	import org.netbeans.modules.hudson.php.ui.options.HudsonOptionsPanelController;	75	import org.netbeans.modules.hudson.php.ui.options.HudsonOptionsPanelController;
73	import org.netbeans.modules.hudson.php.xml.XmlUtils;	76	import org.netbeans.modules.hudson.php.xml.XmlUtils;
74	import org.netbeans.modules.hudson.spi.HudsonSCM;	77	import org.netbeans.modules.hudson.spi.HudsonSCM;
75	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory;	78	import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
76	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ConfigurationStatus;
77	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.Helper;
78	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ProjectHudsonJobCreator;
79	import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;	79	import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
80	import org.netbeans.modules.php.api.phpmodule.PhpModule;	80	import org.netbeans.modules.php.api.phpmodule.PhpModule;
81	import org.netbeans.modules.php.api.util.UiUtils;	81	import org.netbeans.modules.php.api.util.UiUtils;

Lines 19-25 Link Here

(-)a/hudson.subversion/nbproject/project.xml (-1 / +9 lines)
19	<build-prerequisite/>	19	<build-prerequisite/>
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<specification-version>1.15</specification-version>	22	<specification-version>2.0</specification-version>
		23	</run-dependency>
		24	</dependency>
		25	<dependency>
		26	<code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
		27	<build-prerequisite/>
		28	<compile-dependency/>
		29	<run-dependency>
		30	<specification-version>1.0</specification-version>
23	</run-dependency>	31	</run-dependency>
24	</dependency>	32	</dependency>
25	<dependency>	33	<dependency>




import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile;
import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile.EditType;
import org.netbeans.modules.hudson.spi.HudsonSCM;
import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
import static org.netbeans.modules.hudson.subversion.Bundle.*;
import org.netbeans.modules.hudson.ui.api.HudsonSCMHelper;
import org.openide.util.NbBundle.Messages;
import org.openide.util.lookup.ServiceProvider;
import org.openide.windows.OutputListener;

                    loc.appendChild(doc.createElement("local")).appendChild(doc.createTextNode(".")); // NOI18N
                    // HUDSON-3390 would be a more attractive alternative:
                    configXmlSCM.appendChild(doc.createElement("useUpdate")).appendChild(doc.createTextNode("false")); // NOI18N
                    HudsonSCMHelper.addTrigger(doc);
                }
                public @Override ConfigurationStatus problems() {
                    return null;




import org.netbeans.api.diff.StreamSource;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.ui.api.HudsonSCMHelper;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;

    }

    public @Override void outputLineAction(OutputEvent ev) {
        HudsonSCMHelper.noteWillShowDiff(path);
        RequestProcessor.getDefault().post(new Runnable() {
            public @Override void run() {
                String repo = findRepo(module);

                try {
                    final StreamSource before = makeSource(repo, path, startRev);
                    final StreamSource after = makeSource(repo, path, endRev);
                    HudsonSCMHelper.showDiff(before, after, path);
                } catch (IOException x) {
                    LOG.log(Level.INFO, null, x);
                }

Lines 51-57 Link Here

(-)a/hudson.subversion/test/unit/src/org/netbeans/modules/hudson/subversion/HudsonSubversionSCMTest.java (-2 / +2 lines)
51	import java.io.Writer;	51	import java.io.Writer;
52	import org.netbeans.junit.NbTestCase;	52	import org.netbeans.junit.NbTestCase;
53	import org.netbeans.modules.hudson.spi.HudsonSCM;	53	import org.netbeans.modules.hudson.spi.HudsonSCM;
54	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ConfigurationStatus;	54	import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
55	import org.openide.xml.XMLUtil;	55	import org.openide.xml.XMLUtil;
56	import org.w3c.dom.Document;	56	import org.w3c.dom.Document;
57		57
Lines 106-112 Link Here
106	"</hudson.triggers.SCMTrigger>" +	106	"</hudson.triggers.SCMTrigger>" +
107	"</triggers>" +	107	"</triggers>" +
108	"</root>",	108	"</root>",
109	baos.toString("UTF-8").replace('"', '\'').replaceAll("\n *", ""));	109	baos.toString("UTF-8").replace('"', '\'').replaceAll("\n *", "").replaceAll("\r\|\n", ""));
110	}	110	}
111		111
112	public void testSVN17Dir() throws Exception { // #210884	112	public void testSVN17Dir() throws Exception { // #210884

Lines 19-25 Link Here

(-)a/hudson.tasklist/nbproject/project.xml (-1 / +9 lines)
19	<build-prerequisite/>	19	<build-prerequisite/>
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<specification-version>1.13</specification-version>	22	<specification-version>2.0</specification-version>
		23	</run-dependency>
		24	</dependency>
		25	<dependency>
		26	<code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
		27	<build-prerequisite/>
		28	<compile-dependency/>
		29	<run-dependency>
		30	<specification-version>1.0</specification-version>
23	</run-dependency>	31	</run-dependency>
24	</dependency>	32	</dependency>
25	<dependency>	33	<dependency>

Lines 49-55 Link Here

(-)a/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/HudsonScanner.java (-1 / +1 lines)
49	import java.util.prefs.BackingStoreException;	49	import java.util.prefs.BackingStoreException;
50	import org.netbeans.api.project.Project;	50	import org.netbeans.api.project.Project;
51	import org.netbeans.modules.hudson.api.HudsonJob;	51	import org.netbeans.modules.hudson.api.HudsonJob;
52	import org.netbeans.modules.hudson.spi.ProjectHudsonProvider;	52	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider;
53	import static org.netbeans.modules.hudson.tasklist.Bundle.*;	53	import static org.netbeans.modules.hudson.tasklist.Bundle.*;
54	import org.netbeans.spi.tasklist.PushTaskScanner;	54	import org.netbeans.spi.tasklist.PushTaskScanner;
55	import org.netbeans.spi.tasklist.Task;	55	import org.netbeans.spi.tasklist.Task;

Line 0 Link Here

(-)a/hudson.ui/build.xml (+5 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<project basedir="." default="netbeans" name="hudson.ui">
	3	<description>Builds, tests, and runs the project org.netbeans.modules.hudson.ui</description>
	4	<import file="../nbbuild/templates/projectized.xml"/>
	5	</project>

Line 0 Link Here

(-)a/hudson.ui/manifest.mf (+5 lines)
	1	Manifest-Version: 1.0
	2	OpenIDE-Module: org.netbeans.modules.hudson.ui
	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/ui/Bundle.properties
	4	OpenIDE-Module-Specification-Version: 1.0
	5

Line 0 Link Here

(-)a/hudson.ui/nbproject/project.properties (+2 lines)
	1	javac.source=1.6
	2	javac.compilerargs=-Xlint -Xlint:-serial




<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
    <type>org.netbeans.modules.apisupport.project</type>
    <configuration>
        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
            <code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.20</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.api.java.classpath</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.38</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.api.progress</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.34</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core.ide</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.33</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.libs.commons_net</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>2.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.diff</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.43</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.gsf.testrunner</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.34</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.hudson</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>2.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.keyring</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.16</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.35</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.53</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.70</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.spi.quicksearch</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.19</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.31</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.awt</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.58</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.dialogs</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.31</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.explorer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.52</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.7</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.io</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.37</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.loaders</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.49</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.35</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.text</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.56</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.31</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.lookup</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.21</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.63</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <test-dependencies>
                <test-type>
                    <name>unit</name>
                    <test-dependency>
                        <code-name-base>org.netbeans.insane</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                </test-type>
            </test-dependencies>
            <friend-packages>
                <friend>org.netbeans.modules.hudson.ant</friend>
                <friend>org.netbeans.modules.hudson.git</friend>
                <friend>org.netbeans.modules.hudson.maven</friend>
                <friend>org.netbeans.modules.hudson.mercurial</friend>
                <friend>org.netbeans.modules.hudson.php</friend>
                <friend>org.netbeans.modules.hudson.subversion</friend>
                <friend>org.netbeans.modules.hudson.tasklist</friend>
                <friend>org.netbeans.modules.odcs.hudson</friend>
                <package>org.netbeans.modules.hudson.ui.api</package>
                <package>org.netbeans.modules.hudson.ui.spi</package>
            </friend-packages>
        </data>
    </configuration>
</project>




import javax.swing.JPanel;
import org.apache.commons.net.util.Base64;
import org.netbeans.api.keyring.Keyring;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.api.HudsonVersion;
import org.netbeans.modules.hudson.api.Utilities;
import org.netbeans.modules.hudson.impl.HudsonManagerImpl;
import org.netbeans.modules.hudson.spi.ConnectionAuthenticator;
import static org.netbeans.modules.hudson.ui.Bundle.*;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;

                LOG.log(Level.FINE, "enabled on {0}", home);
            }
            APITokenConnectionAuthenticator panel = new APITokenConnectionAuthenticator();
            String server = HudsonManager.simplifyServerLocation(home.toString(), true);
            String key = "tok." + server;
            String username = FormLogin.loginPrefs().get(server, null);
            if (username != null) {

                }
            }
            panel.locationField.setText(home.toString());
            DialogDescriptor dd = new DialogDescriptor(panel, Bundle.FormLogin_log_in());
            if (DialogDisplayer.getDefault().notify(dd) != NotifyDescriptor.OK_OPTION) {
                return null;
            }

            FormLogin.loginPrefs().put(server, username);
            String token = new String(panel.tokField.getPassword());
            panel.tokField.setText("");
            Keyring.save(key, token.toCharArray(), Bundle.APITokenConnectionAuthenticator_password_description(home, username));
            BASIC_AUTH.put(home.toString(), new Base64(0).encodeToString((username + ':' + token).getBytes()).trim());
            try {
                return conn.getURL().openConnection();

Lines 39-44 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/Bundle.properties (+1 lines)
39	# However, if you add GPL Version 2 code and therefore, elected the GPL	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	40	# Version 2 license, then the option applies only if the new code is
41	# made subject to such option by the copyright holder.	41	# made subject to such option by the copyright holder.
		42	OpenIDE-Module-Name=Hudson UI
42		43
43	FormLogin.locationLabel.text=&Server:	44	FormLogin.locationLabel.text=&Server:
44	FormLogin.userLabel.text=&Username:	45	FormLogin.userLabel.text=&Username:




import java.util.prefs.Preferences;
import javax.swing.JPanel;
import org.netbeans.api.keyring.Keyring;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.spi.PasswordAuthorizer;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.NbBundle.Messages;
import static org.netbeans.modules.hudson.ui.Bundle.*;
import org.openide.util.NbPreferences;
import org.openide.util.lookup.ServiceProvider;


            "FormLogin.log_in=Log in to Hudson",
            "# {0} - server location", "# {1} - user name", "FormLogin.password_description=Password for {1} on {0}"
        })
        @Override
        public String[] authorize(URL home) {
            FormLogin panel = new FormLogin();
            String server = HudsonManager.simplifyServerLocation(home.toString(), true);
            String username = loginPrefs().get(server, null);
            if (username != null) {
                panel.userField.setText(username);

                }
            }
            panel.locationField.setText(home.toString());
            DialogDescriptor dd = new DialogDescriptor(panel, Bundle.FormLogin_log_in());
            if (DialogDisplayer.getDefault().notify(dd) != NotifyDescriptor.OK_OPTION) {
                return null;
            }

            loginPrefs().put(server, username);
            String password = new String(panel.passField.getPassword());
            panel.passField.setText("");
            Keyring.save(server, password.toCharArray(), Bundle.FormLogin_password_description(home, username));
            return new String[] {username, password};
        }
    }




import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.ui.api.UI;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.Cancellable;
import org.openide.util.NbBundle.Messages;
import org.openide.util.RequestProcessor;
import static org.netbeans.modules.hudson.ui.actions.Bundle.*;

/**
 * #161911: downloads & runs latest hudson.war and configures it for you.


    @Messages("AddTestInstanceAction.label=Try Hudson on &Localhost")
    public AddTestInstanceAction() {
        super(Bundle.AddTestInstanceAction_label());
    }

    @Override
    public void actionPerformed(ActionEvent e) {
        RequestProcessor.getDefault().post(this);
    }

        "AddTestInstanceAction.starting=Downloading & running Hudson...",
        "AddTestInstanceAction.instance_name=Local Test Server"
    })
    @Override
    public void run() {
        // XXX could use JavaPlatformManager.default.defaultPlatform.findTool("javaws") if could depend on java.platform
        File javaHome = new File(System.getProperty("java.home"));

            javaws = new File(bindir, "javaws");
        }
        if (!javaws.isFile()) {
            warning(Bundle.AddTestInstanceAction_no_javaws(javaws));
            return;
        }
        try {
            int exit = new ProcessBuilder(javaws.getAbsolutePath(), "https://hudson.dev.java.net/hudson.jnlp").start().waitFor();
            if (exit != 0) {
                warning(Bundle.AddTestInstanceAction_could_not_run());
                return;
            }
        } catch (Exception x) {
            warning(Bundle.AddTestInstanceAction_could_not_run());
            LOG.log(Level.INFO, null, x);
            return;
        }
        final AtomicBoolean cancelled = new AtomicBoolean();
        ProgressHandle progress = ProgressHandleFactory.createHandle(
                Bundle.AddTestInstanceAction_starting(), new Cancellable() {
            @Override
            public boolean cancel() {
                cancelled.set(true);
                return true;

                try {
                    new ConnectionBuilder().url(localhost).connection();
                    // Success!
                    HudsonManager.addInstance(Bundle.AddTestInstanceAction_instance_name(), localhost, 1, true); // NOI18N
                    UI.selectNode(localhost);
                    break;
                } catch (IOException x) {




LBL_Add_Instance=&Add Hudson Instance...

LBL_StartJobAction=&Start Job

CreateJobPanel.projectLabel.text=&Project to Build:
CreateJobPanel.nameLabel.text=Build &Name:
CreateJobPanel.browse.text=&Browse...
CreateJobPanel.serverLabel.text=Build &Server:
CreateJobPanel.addServer.text=&Add...
CreateJobPanel.explanationLabel.text=<html>Build Server will automatically get the sources and libraries from the same\n<br>source code repository and run the same build targets as your local project.
ShowChanges.label=Show Changes
ShowChanges.no_changes=No changes.
# {0} - job #build

CreateJobPanel.unknown_project_type=The IDE does not know how to set up a job for this project.
CreateJobPanel.name_taken=This name is taken. Pick another.
CreateJobPanel.already_associated=This project already seems to be associated with a Hudson job.
CreateJobPanel.AccessibleContext.accessibleDescription=Create a new build job for a project.
CreateJobPanel.explanationLabel.text=<html>Build Server will automatically get the sources and libraries from the same\n<br>source code repository and run the same build targets as your local project.
CreateJobPanel.browse.AccessibleContext.accessibleDescription=Select a project to build from disk.
CreateJobPanel.browse.text=&Browse...
CreateJobPanel.project.AccessibleContext.accessibleDescription=Select project for which to create job.
CreateJobPanel.nameLabel.text=Build &Name:
CreateJobPanel.addServer.AccessibleContext.accessibleDescription=Add a new build server.
CreateJobPanel.addServer.text=&Add...
CreateJobPanel.projectLabel.text=&Project to Build:
CreateJobPanel.name.AccessibleContext.accessibleDescription=Name of new job.
CreateJobPanel.serverLabel.text=Build &Server:
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

# Copyright 2013 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 2013 Sun Microsystems, Inc.
CreateJobPanel.server.AccessibleContext.accessibleDescription=Select server on which to create job.
CreateJobPanel.project.AccessibleContext.accessibleDescription=Select project for which to create job.
CreateJobPanel.name.AccessibleContext.accessibleDescription=Name of new job.
CreateJobPanel.AccessibleContext.accessibleDescription=Create a new build job for a project.

Lines 60-72 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/actions/CreateJob.java (-19 / +14 lines)
60	import org.netbeans.api.project.ui.OpenProjects;	60	import org.netbeans.api.project.ui.OpenProjects;
61	import org.netbeans.modules.hudson.api.ConnectionBuilder;	61	import org.netbeans.modules.hudson.api.ConnectionBuilder;
62	import org.netbeans.modules.hudson.api.HudsonInstance;	62	import org.netbeans.modules.hudson.api.HudsonInstance;
63	import org.netbeans.modules.hudson.api.UI;	63	import org.netbeans.modules.hudson.api.HudsonManager;
64	import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
65	import org.netbeans.modules.hudson.impl.HudsonManagerImpl;
66	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ProjectHudsonJobCreator;
67	import org.netbeans.modules.hudson.spi.ProjectHudsonProvider;
68	import org.netbeans.modules.hudson.api.Utilities;	64	import org.netbeans.modules.hudson.api.Utilities;
69	import org.netbeans.modules.hudson.util.UsageLogging;	65	import org.netbeans.modules.hudson.ui.api.UI;
		66	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory.ProjectHudsonJobCreator;
		67	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider;
		68	import org.netbeans.modules.hudson.ui.util.UsageLogging;
70	import org.openide.DialogDescriptor;	69	import org.openide.DialogDescriptor;
71	import org.openide.DialogDisplayer;	70	import org.openide.DialogDisplayer;
72	import org.openide.NotifyDescriptor;	71	import org.openide.NotifyDescriptor;
Lines 77-83 Link Here
77	import org.openide.util.Exceptions;	76	import org.openide.util.Exceptions;
78	import org.openide.util.NbBundle;	77	import org.openide.util.NbBundle;
79	import org.openide.util.NbBundle.Messages;	78	import org.openide.util.NbBundle.Messages;
80	import static org.netbeans.modules.hudson.ui.actions.Bundle.*;
81	import org.openide.util.RequestProcessor;	79	import org.openide.util.RequestProcessor;
82	import org.openide.xml.XMLUtil;	80	import org.openide.xml.XMLUtil;
83	import org.w3c.dom.Document;	81	import org.w3c.dom.Document;
Lines 111-128 Link Here
111	"CreateJob.create=Create"	109	"CreateJob.create=Create"
112	})	110	})
113	@Override public void actionPerformed(ActionEvent e) {	111	@Override public void actionPerformed(ActionEvent e) {
114	if (instance instanceof HudsonInstanceImpl) {	112	Action custom = instance.getPersistence().getNewJobAction();
115	Action custom = ((HudsonInstanceImpl) instance)	113	if (custom != null) {
116	.getPersistence().getNewJobAction();	114	custom.actionPerformed(e);
117	if (custom != null) {	115	return;
118	custom.actionPerformed(e);
119	return;
120	}
121	}	116	}
122	final CreateJobPanel panel = new CreateJobPanel();	117	final CreateJobPanel panel = new CreateJobPanel();
123	final DialogDescriptor dd = new DialogDescriptor(panel, CreateJob_title());	118	final DialogDescriptor dd = new DialogDescriptor(panel, Bundle.CreateJob_title());
124	final AtomicReference<Dialog> dialog = new AtomicReference<Dialog>();	119	final AtomicReference<Dialog> dialog = new AtomicReference<Dialog>();
125	final JButton createButton = new JButton(CreateJob_create());	120	final JButton createButton = new JButton(Bundle.CreateJob_create());
126	createButton.addActionListener(new ActionListener() {	121	createButton.addActionListener(new ActionListener() {
127	@Override public void actionPerformed(ActionEvent e) {	122	@Override public void actionPerformed(ActionEvent e) {
128	RequestProcessor.getDefault().post(new Runnable() {	123	RequestProcessor.getDefault().post(new Runnable() {
Lines 144-150 Link Here
144	if (instance != null) {	139	if (instance != null) {
145	_instance = instance;	140	_instance = instance;
146	} else {	141	} else {
147	Collection<? extends HudsonInstance> instances = HudsonManagerImpl.getDefault().getInstances();	142	Collection<? extends HudsonInstance> instances = HudsonManager.getAllInstances();
148	_instance = instances.isEmpty() ? null : instances.iterator().next();	143	_instance = instances.isEmpty() ? null : instances.iterator().next();
149	}	144	}
150	panel.init(dd, _instance);	145	panel.init(dd, _instance);
Lines 174-180 Link Here
174	postData(baos.toByteArray()).	169	postData(baos.toByteArray()).
175	httpConnection().disconnect();	170	httpConnection().disconnect();
176	URLDisplayer.getDefault().showURL(new URL(instance.getUrl() + "job/" + Utilities.uriEncode(name) + "/")); // NOI18N	171	URLDisplayer.getDefault().showURL(new URL(instance.getUrl() + "job/" + Utilities.uriEncode(name) + "/")); // NOI18N
177	((HudsonInstanceImpl) instance).synchronize(false);	172	instance.synchronize(false);
178	ProjectHudsonProvider.getDefault().recordAssociation(project,	173	ProjectHudsonProvider.getDefault().recordAssociation(project,
179	new ProjectHudsonProvider.Association(instance.getUrl(), name));	174	new ProjectHudsonProvider.Association(instance.getUrl(), name));
180	OpenProjects.getDefault().open(new Project[] {project}, false);	175	OpenProjects.getDefault().open(new Project[] {project}, false);
Lines 185-191 Link Here
185	} catch (ProjectHudsonJobCreator.SilentIOException x) {	180	} catch (ProjectHudsonJobCreator.SilentIOException x) {
186	Logger.getLogger(CreateJob.class.getName()).log(Level.INFO, null, x);	181	Logger.getLogger(CreateJob.class.getName()).log(Level.INFO, null, x);
187	} catch (IOException x) {	182	} catch (IOException x) {
188	Exceptions.attachLocalizedMessage(x, CreateJob_failure());	183	Exceptions.attachLocalizedMessage(x, Bundle.CreateJob_failure());
189	Logger.getLogger(CreateJob.class.getName()).log(Level.WARNING, null, x);	184	Logger.getLogger(CreateJob.class.getName()).log(Level.WARNING, null, x);
190	}	185	}
191	}	186	}




import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory;
import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory.ProjectHudsonJobCreator;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider;
import org.netbeans.modules.hudson.ui.wizard.InstanceDialog;
import org.netbeans.spi.project.ui.support.ProjectChooser;
import org.openide.NotificationLineSupport;

    }

    private void updateServerModel() {
        server.setModel(new DefaultComboBoxModel(HudsonManager.getAllInstances().toArray()));
    }

    private void computeTakenNames() {





package org.netbeans.modules.hudson.ui.actions;

import java.awt.Toolkit;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.netbeans.api.project.Project;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.spi.HudsonLogger;
import org.netbeans.modules.hudson.spi.HudsonLogger.HudsonLogSession;
import org.netbeans.modules.hudson.spi.HudsonSCM;
import org.netbeans.modules.hudson.spi.ProjectHudsonProvider;
import org.openide.awt.HtmlBrowser.URLDisplayer;
import org.openide.awt.StatusDisplayer;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
import org.openide.util.NbBundle.Messages;
import org.openide.util.RequestProcessor;
import org.openide.util.lookup.ServiceProvider;
import org.openide.windows.OutputEvent;
import org.openide.windows.OutputListener;
import org.openide.windows.OutputWriter;
import static org.netbeans.modules.hudson.ui.actions.Bundle.*;

/**
 * Manages warning/error/stack trace hyperlinking in the Output Window.
 */
public final class Hyperlinker {

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


                break;
            }
        }
        // DefaultLogger is last and always handles it
    }

    @ServiceProvider(service = HudsonLogger.class, position = Integer.MAX_VALUE)
    public static final class DefaultLogger implements HudsonLogger {
        private final HudsonJob job;
        /** Looks for errors mentioning workspace files. Prefix captures Maven's [WARNING], Ant's [javac], etc. */
        private final Pattern hyperlinkable;
        PlainLoggerLogic(HudsonJob job, String jobName) {
            this.job = job;
            // XXX support Windows build servers (using backslashes)
            String jobNameQ = Pattern.quote(jobName);
            hyperlinkable = Pattern.compile("\\s*(?:\\[.+\\] )?/.+?/(?:jobs/" + jobNameQ + "/workspace|workspace/" + jobNameQ + // NOI18N
                    ")/([^:]+):(?:\\[?([0-9]+)[:,](?:([0-9]+)[]:])?)? (?:warning: )?(.+)"); // NOI18N
        }
        OutputListener findHyperlink(String line) {
            try {
                Matcher m = hyperlinkable.matcher(line);
                if (m.matches()) {
                    final String path = m.group(1);
                    final int row = m.group(2) != null ? Integer.parseInt(m.group(2)) - 1 : -1;
                    final int col = m.group(3) != null ? Integer.parseInt(m.group(3)) - 1 : -1;
                    final String message = m.group(4);
                    return new Hyperlink(job, path, message, row, col);
                }
                m = REMOTE_URL.matcher(line);
                if (m.matches()) {
                    return new URLHyperlink(new URL(m.group()));
                }
            } catch (MalformedURLException x) {
                LOG.log(Level.FINE, null, x);
            }
            return null;
        }
    }

        @Override
        public HudsonLogSession createSession(HudsonJob job) {
        public HudsonLogSession createSession(final HudsonJob job) {
            return new HudsonLogSession() {

                @Override
                public boolean handle(String line, OutputWriter stream) {
                    OutputListener link = logic.findHyperlink(line);
                    if (link != null) {
                        try {
                            stream.println(line, link);
                            return true;
                        } catch (IOException x) {
                            LOG.log(Level.INFO, null, x);
                        }
                    }
                    stream.println(line);
                    return true;
                }
            };
        }
    }

    private static class Hyperlink implements OutputListener {

        private static final RequestProcessor RP = new RequestProcessor(Hyperlink.class);

        private final HudsonJob job;
        private final String path;
        private final String message;
        private final int row;
        private final int col;

        public Hyperlink(HudsonJob job, String path, String message, int row, int col) {
            this.job = job;
            this.path = path;
            this.message = message;
            this.row = row;
            this.col = col;
        }

        public void outputLineAction(OutputEvent ev) {
            acted(true);
        }

        public void outputLineSelected(OutputEvent ev) {
            acted(false);
        }

        @Messages({"# {0} - file path in workspace", "Hyperlinker.looking_for=Looking for {0}...", "# {0} - file path in workspace", "Hyperlinker.not_found=No file {0} found in remote workspace."})
        private void acted(final boolean force) {
            RP.post(new Runnable() {
                public void run() {
                    FileObject f = null;
                    Project p = ProjectHudsonProvider.getDefault().findAssociatedProject(ProjectHudsonProvider.Association.forJob(job));
                    if (p != null) {
                        String localPath = null;
                        File localRoot = FileUtil.toFile(p.getProjectDirectory());
                        if (localRoot != null) {
                            for (HudsonSCM scm : Lookup.getDefault().lookupAll(HudsonSCM.class)) {
                                localPath = scm.translateWorkspacePath(job, path, localRoot);
                                if (localPath != null) {
                                    LOG.log(Level.FINE, "Translating remote path {0} to {1} using {2}", new Object[] {path, localPath, scm});
                                    break;
                                }
                            }
                        }
                        if (localPath == null) {
                            LOG.fine("Falling back to guess that remote workspace is a project root");
                            localPath = path;
                        }
                        // XXX permit localPath to include ../ segments; for Hg this is reasonable
                        f = p.getProjectDirectory().getFileObject(localPath);
                        LOG.log(Level.FINE, "Tried to find local file in {0} at {1} using {2}", new Object[] {p, f, localPath});
                        // XXX #159829: consider aligning local line number with remote line number somehow
                    }
                    if (f == null) {
                        StatusDisplayer.getDefault().setStatusText(Hyperlinker_looking_for(path));
                        f = job.getRemoteWorkspace().findResource(path);
                        LOG.log(Level.FINE, "Tried to find remote file at {0} using {1}", new Object[] {f, path});
                    }
                    if (f == null) {
                        if (force) {
                        StatusDisplayer.getDefault().setStatusText(Hyperlinker_not_found(path));
                            Toolkit.getDefaultToolkit().beep();
                        }
                        return;
                    }
                    // XXX could be useful to select this file in the workspace node (see related #159838)
                    StatusDisplayer.getDefault().setStatusText(message);
                    HudsonLogger.Helper.openAt(f, row, col, force);
                }
            });
        }

        public void outputLineCleared(OutputEvent ev) {}

        public @Override String toString() {
            return path + ":" + row + ":" + col + ":" + message; // NOI18N
        }
        
    }

    private static class URLHyperlink implements OutputListener {

        private final URL u;

        URLHyperlink(URL u) {
            this.u = u;
        }

        public void outputLineAction(OutputEvent ev) {
            URLDisplayer.getDefault().showURL(u);
        }

        public void outputLineSelected(OutputEvent ev) {}

        public void outputLineCleared(OutputEvent ev) {}

        public @Override String toString() {
            return u.toString();
        }

    }

}




import javax.swing.AbstractAction;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
import org.netbeans.modules.hudson.spi.ConnectionAuthenticator;
import org.openide.awt.ActionRegistration;
import org.openide.awt.ActionID;

    private static final Logger LOG = Logger.getLogger(LogInAction.class.getName());
    private static final RequestProcessor RP = new RequestProcessor(LogInAction.class);

    private final HudsonInstance instance;
    
    public LogInAction(HudsonInstance instance) {
        super(Bundle.CTL_LogInAction());
        this.instance = instance;
    }




import javax.swing.AbstractAction;
import java.net.MalformedURLException;
import java.net.URL;
import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionRegistration;
import org.openide.awt.HtmlBrowser.URLDisplayer;
import org.openide.util.NbBundle.Messages;
import static org.netbeans.modules.hudson.ui.actions.Bundle.*;

/**
 * Action which displays selected job in browser.

@ActionRegistration(displayName="#LBL_OpenInBrowserAction", iconInMenu=false)
@ActionReference(path=HudsonInstance.ACTION_PATH, position=600)
@Messages("LBL_OpenInBrowserAction=&Open in Browser")
public final class OpenUrlAction extends AbstractAction {

    public static Action forOpenable(OpenableInBrowser openable) {
        return new OpenUrlAction(Collections.singletonList(openable));

    private final List<OpenableInBrowser> openables;

    public OpenUrlAction(List<OpenableInBrowser> openables) {
        super(Bundle.LBL_OpenInBrowserAction());
        this.openables = openables;
    }
    




import java.awt.event.ActionEvent;
import java.util.Collections;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.Utilities;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionRegistration;

public class PersistInstanceAction extends AbstractAction implements ContextAwareAction {

    public PersistInstanceAction() {
        this(Collections.<HudsonInstance>emptyList());
    }

    public @Override Action createContextAwareInstance(Lookup actionContext) {
        return new PersistInstanceAction(actionContext.lookupAll(HudsonInstance.class));
    }

    private final Collection<? extends HudsonInstance> instances;

    private PersistInstanceAction(Collection<? extends HudsonInstance> instances) {
        super(LBL_Persist_Instance());
        this.instances = instances;
        for (HudsonInstance instance : instances) {
            if (instance.isPersisted()) {
                setEnabled(false);
                break;

    }

    public @Override void actionPerformed(ActionEvent e) {
        for (HudsonInstance instance : instances) {
            Utilities.persistInstance(instance);
        }
    }





import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import static org.netbeans.modules.hudson.ui.actions.Bundle.*;
import org.openide.util.NbBundle.Messages;

/**

        assoc = ProjectHudsonProvider.Association.forJob(job);
        this.alreadyAssociatedProject = ProjectHudsonProvider.getDefault().findAssociatedProject(assoc);
        if (alreadyAssociatedProject == null) {
            putValue(NAME, Bundle.ProjectAssociationAction_associate());
        } else {
            putValue(NAME, Bundle.ProjectAssociationAction_dissociate(ProjectUtils.getInformation(alreadyAssociatedProject).getDisplayName()));
        }
    }


            SortedSet<Project> projects = new TreeSet<Project>(ProjectRenderer.comparator());
            projects.addAll(Arrays.asList(OpenProjects.getDefault().getOpenProjects()));
            if (projects.isEmpty()) {
                DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(Bundle.ProjectAssociationAction_open_some_projects(), NotifyDescriptor.INFORMATION_MESSAGE));
                return;
            }
            JComboBox box = new JComboBox(new DefaultComboBoxModel(projects.toArray(new Project[projects.size()])));
            box.setRenderer(new ProjectRenderer());
            if (DialogDisplayer.getDefault().notify(new NotifyDescriptor(box, Bundle.ProjectAssociationAction_title_select_project(), NotifyDescriptor.OK_CANCEL_OPTION, NotifyDescriptor.PLAIN_MESSAGE, null, null)) != NotifyDescriptor.OK_OPTION) {
                return;
            }
            if (!ProjectHudsonProvider.getDefault().recordAssociation((Project) box.getSelectedItem(), assoc)) {
                DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(Bundle.ProjectAssociationAction_could_not_associate(), NotifyDescriptor.WARNING_MESSAGE));
            }
        } else {
            if (!ProjectHudsonProvider.getDefault().recordAssociation(alreadyAssociatedProject, null)) {
                DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(Bundle.ProjectAssociationAction_could_not_dissociate(), NotifyDescriptor.WARNING_MESSAGE));
            }
        }
    }





import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.ui.impl.HudsonConsoleDisplayer;
import org.netbeans.modules.hudson.spi.BuilderConnector;
import org.openide.util.NbBundle.Messages;

/**


    @Override
    public void actionPerformed(ActionEvent e) {
        if (moduleBuild != null) {
            if (moduleBuild.canShowConsole()) {
                moduleBuild.showConsole(new HudsonConsoleDisplayer(moduleBuild));
                    ((HudsonInstanceImpl) instance).getBuilderConnector();
            if (moduleBuild != null) {
                builderClient.getConsoleDisplayer().showConsole(moduleBuild);
            } else {
                builderClient.getConsoleDisplayer().showConsole(build);
            }
        } else if (build.canShowConsole()) {
            build.showConsole(new HudsonConsoleDisplayer(build));
        }
    }

    @Override
    public boolean isEnabled() {
        return build.canShowConsole();
        if (instance instanceof HudsonInstanceImpl) {
            BuilderConnector builderClient =
                    ((HudsonInstanceImpl) instance).getBuilderConnector();
            return builderClient.getConsoleDisplayer() != null;
        }
        return false;
    }
}




import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.Action;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.ui.impl.HudsonFailureDisplayer;
import org.netbeans.modules.hudson.spi.BuilderConnector;
import org.openide.util.ContextAwareAction;
import org.openide.util.Lookup;
import org.openide.util.NbBundle.Messages;

     */
    private boolean canShowFailures(HudsonJobBuild build,
            HudsonMavenModuleBuild module) {

        if (module == null && !HudsonJobBuild.Result.UNSTABLE.equals(
                build.getResult())) {
            return false;
        } else if (module != null) {
            boolean failed = false;
            switch (module.getColor()) {
                case yellow:
                case yellow_anime:
                    failed = true;
            }
            if (!failed) {
                return false;
            } else if (module != null) {
                boolean failed = false;
                switch (module.getColor()) {
                    case yellow:
                    case yellow_anime:
                        failed = true;
                }
                if (!failed) {
                    return false;
                }
            }
            BuilderConnector builderClient =
                    ((HudsonInstanceImpl) instance).getBuilderConnector();
            return builderClient.getFailureDisplayer() != null;
        }
        return build.canShowFailures();
    }

    /**

        if (!canShowFailures(build, moduleBuild)) {
            return;
        }
        if (moduleBuild != null) {
            if (moduleBuild.canShowFailures()) {
                moduleBuild.showFailures(new HudsonFailureDisplayer(moduleBuild));
            }
        } else if (build.canShowFailures()) {
            if (build.getMavenModules().isEmpty()) {
                build.showFailures(new HudsonFailureDisplayer(build));
            } else {
                for (HudsonMavenModuleBuild extraModule
                        : getExtraModuleBuilds(build)) {
                    extraModule.showFailures(
                            new HudsonFailureDisplayer(extraModule));
                    if (build.getMavenModules().isEmpty()) {
                        failureDisplayer.showFailures(build);
                    } else {
                        for (HudsonMavenModuleBuild extraModule
                                : getExtraModuleBuilds(build)) {
                            failureDisplayer.showFailures(extraModule);
                        }
                    }
                }
            }
        }




import javax.swing.AbstractAction;
import javax.swing.Action;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
import static org.netbeans.modules.hudson.ui.actions.Bundle.*;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;

@Messages("LBL_SynchronizeAction=&Synchronize")
public class SynchronizeAction extends AbstractAction implements ContextAwareAction {

    private final Collection<? extends HudsonInstance> instances;

    public SynchronizeAction() {
        this(Collections.<HudsonInstance>emptySet());
    }

    @Override public Action createContextAwareInstance(Lookup actionContext) {
        return new SynchronizeAction(actionContext.lookupAll(HudsonInstance.class));
    }

    @Messages("LBL_SynchronizeAction_disconnected=Connect")
    private SynchronizeAction(Collection<? extends HudsonInstance> instances) {
        this.instances = instances;
        boolean allForbidden = true;
        boolean allDisconnected = true;
        for (HudsonInstance instance : instances) {
            if (!instance.isForbidden()) {
                allForbidden = false;
            }

    }
    
    public @Override void actionPerformed(ActionEvent e) {
        for (HudsonInstance instance : instances) {
            instance.synchronize(true);
        }
    }




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 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 2013 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.api;

import java.awt.BorderLayout;
import java.awt.EventQueue;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.api.diff.Diff;
import org.netbeans.api.diff.DiffView;
import org.netbeans.api.diff.StreamSource;
import org.netbeans.modules.hudson.api.Utilities;
import org.netbeans.modules.hudson.spi.HudsonSCM;
import org.openide.awt.StatusDisplayer;
import org.openide.util.NbBundle;
import org.openide.windows.TopComponent;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

/**
 * Convenience methods for SCM implementations.
 */
public class HudsonSCMHelper {
    private static final Logger LOG = Logger.getLogger(HudsonSCM.class.getName());

        private HudsonSCMHelper() {}

        /**
         * Add an SCM polling trigger.
         * @param configXml a {@code config.xml}
         */
        public static void addTrigger(Document configXml) {
            Element root = configXml.getDocumentElement();
            root.appendChild(configXml.createElement("triggers")). // NOI18N // XXX reuse existing <triggers> if found
                    appendChild(configXml.createElement("hudson.triggers.SCMTrigger")). // NOI18N
                    appendChild(configXml.createElement("spec")). // NOI18N
                    // XXX pretty arbitrary but seems like a decent first guess
                    appendChild(configXml.createTextNode("@hourly")); // NOI18N
        }

        @Deprecated
        public static String xpath(String expr, Element xml) {
            return Utilities.xpath(expr, xml);
        }

        /**
         * Just notify the user that a diff will be shown for a given path.
         * @param path a path, probably somehow repo-relative
         */
        @NbBundle.Messages({"# {0} - portion of file path", "HudsonSCM.loading_diff=Loading diff for {0}..."})
        public static void noteWillShowDiff(String path) {
            StatusDisplayer.getDefault().setStatusText(Bundle.HudsonSCM_loading_diff(path));
        }

        /**
         * Display a diff window for a file.
         * @param before the former contents
         * @param after the new contents
         * @param path some representation of the file path
         */
        @NbBundle.Messages({"# {0} - file basename", "HudsonSCM.diffing=Diffing {0}"})
        public static void showDiff(final StreamSource before, final StreamSource after, final String path) {
            EventQueue.invokeLater(new Runnable() {
                @Override public void run() {
                    try {
                        DiffView view = Diff.getDefault().createDiff(before, after);
                        // XXX reuse the same TC
                        DiffTopComponent tc = new DiffTopComponent(view);
                        tc.setName(path);
                        tc.setDisplayName(Bundle.HudsonSCM_diffing(path.replaceFirst(".+/", ""))); //NOI18N
                        tc.open();
                        tc.requestActive();
                    } catch (IOException x) {
                        LOG.log(Level.INFO, null, x);
                    }
                }
            });
        }
        private static class DiffTopComponent extends TopComponent {
            DiffTopComponent(DiffView view) {
                setLayout(new BorderLayout());
                add(view.getComponent(), BorderLayout.CENTER);
            }
            public @Override int getPersistenceType() {
                return TopComponent.PERSISTENCE_NEVER;
            }
            protected @Override String preferredID() {
                return "DiffTopComponent"; // NOI18N
            }
        }
}




 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.api;

import java.beans.PropertyVetoException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Action;
import javax.swing.Icon;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.api.Utilities;
import org.netbeans.modules.hudson.ui.actions.ShowBuildConsole;
import org.netbeans.modules.hudson.ui.actions.ShowChanges;
import org.netbeans.modules.hudson.ui.actions.ShowFailures;

     * Return icon for a Hudson Job build.
     */
    public static Icon getIcon(HudsonJobBuild build) {
        return makeIcon(Utilities.getColorForBuild(build).iconBase());
    }

    private static Icon makeIcon(String iconBase) {




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 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 2013 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.impl;

import javax.swing.Action;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.spi.ConsoleDataDisplayerImpl;
import org.netbeans.modules.hudson.ui.actions.Hyperlinker;
import org.openide.windows.IOProvider;
import org.openide.windows.InputOutput;
import org.openide.windows.OutputWriter;

/**
 *
 * @author jhavlin
 */
public class HudsonConsoleDisplayer extends ConsoleDataDisplayerImpl {

    private final HudsonJob job;
    private final String displayName;
    private OutputWriter out;
    private OutputWriter err;
    private Hyperlinker hyperlinker;
    private InputOutput io;

    public HudsonConsoleDisplayer(HudsonJobBuild build) {
        this.job = build.getJob();
        this.displayName = build.getDisplayName();
    }

    public HudsonConsoleDisplayer(HudsonMavenModuleBuild moduleBuild) {
        this.job = moduleBuild.getBuild().getJob();
        this.displayName = moduleBuild.getDisplayName();
    }

    @Override
    public synchronized void open() {
        hyperlinker = new Hyperlinker(job);
        io = IOProvider.getDefault().getIO(displayName, new Action[]{});
        io.select();
        out = io.getOut();
        err = io.getErr();
    }

    @Override
    public synchronized boolean writeLine(String line) {
        if (out.checkError() || err.checkError() || io.isClosed()) {
            return false;
        }
        OutputWriter stream = line.matches("(?i).*((warn(ing)?|err(or)?)[]:]|failed).*") ? err : out; //NOI18N
        hyperlinker.handleLine(line, stream);
        return true;
    }

    @Override
    public void close() {
        out.close();
        err.close();
    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 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 2013 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.impl;

import java.awt.event.ActionEvent;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.AbstractAction;
import javax.swing.Action;
import org.netbeans.api.java.classpath.GlobalPathRegistry;
import org.netbeans.api.project.Project;
import org.netbeans.modules.gsf.testrunner.api.CallstackFrameNode;
import org.netbeans.modules.gsf.testrunner.api.DiffViewAction;
import org.netbeans.modules.gsf.testrunner.api.Manager;
import org.netbeans.modules.gsf.testrunner.api.TestMethodNode;
import org.netbeans.modules.gsf.testrunner.api.TestRunnerNodeFactory;
import org.netbeans.modules.gsf.testrunner.api.TestSession;
import org.netbeans.modules.gsf.testrunner.api.TestSuite;
import org.netbeans.modules.gsf.testrunner.api.Testcase;
import org.netbeans.modules.gsf.testrunner.api.TestsuiteNode;
import org.netbeans.modules.gsf.testrunner.api.Trouble;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.api.ui.FailureDataDisplayer;
import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
import org.netbeans.modules.hudson.spi.FailureDataDisplayerImpl;
import org.netbeans.modules.hudson.ui.actions.Hyperlinker;
import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;
import org.openide.awt.StatusDisplayer;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.windows.IOProvider;
import org.openide.windows.InputOutput;
import org.openide.windows.OutputWriter;

/**
 *
 * @author jhavlin
 */
@NbBundle.Messages({
    "# {0} - job #build", "ShowFailures.title={0} Test Failures",
    "# {0} - class & method name of failed test", "# {1} - suite name of failed test", "ShowFailures.from_suite={0} (from {1})",
    "LBL_GotoSource=Go to Source",
    "# {0} - Java source file resource path", "no_source_to_hyperlink=Could not find {0} among open projects."
})
public class HudsonFailureDisplayer extends FailureDataDisplayerImpl {

    private static final RequestProcessor RP = new RequestProcessor(
            HudsonFailureDisplayer.class.getName());
    private static final Logger LOG = Logger.getLogger(
            HudsonFailureDisplayer.class.getName());
    private static final Pattern ASSERTION_FAILURE = Pattern.compile(
            "(?m)junit[.]framework[.](AssertionFailedError|(Array)?ComparisonFailure)|java[.]lang[.]AssertionError($|: )"); //NOI18N

    private final Project project;
    private final TestSession session;
    private final Hyperlinker hyperlinker;
    private InputOutput io;

    private final HudsonJob job;
    private final HudsonJobBuild build;
    private final String displayName;

    public HudsonFailureDisplayer(HudsonJobBuild build) {
        this(build, build.getDisplayName());
    }

    public HudsonFailureDisplayer(HudsonMavenModuleBuild moduleBuild) {
        this(moduleBuild.getBuild(), moduleBuild.getDisplayName());
    }

    private HudsonFailureDisplayer(HudsonJobBuild build,
            String displayName) {
        this.build = build;
        this.job = this.build.getJob();
        this.displayName = displayName;
        this.hyperlinker = new Hyperlinker(job);
        // Store reference to project here, as reference in test session
        // is weak.
        this.project = createDummyProject();
        this.session = createTestSession(displayName);
    }

    private Project createDummyProject() {
        return new Project() {
            public @Override
            FileObject getProjectDirectory() {
                return FileUtil.createMemoryFileSystem().getRoot();
            }

            public @Override
            Lookup getLookup() {
                return Lookup.EMPTY;
            }
        };
    }

    private TestSession createTestSession(String displayName) {

        TestRunnerNodeFactory testRunnerNodeFactory
                = new HudsonTestRunnerNodeFactory();
        return new TestSession(displayName, project,
                TestSession.SessionType.TEST, testRunnerNodeFactory);
    }

    private void prepareOutput() {
        if (io == null) {
            String title = Bundle.ShowFailures_title(displayName);
            io = IOProvider.getDefault().getIO(title, new Action[0]);
            io.select();
            Manager.getInstance().testStarted(session);
        }
    }

    @Override
    public void open() {
    }

    @Override
    public void showSuite(FailureDataDisplayer.Suite s) {

        prepareOutput();
        OutputWriter out = io.getOut();
        OutputWriter err = io.getErr();
        TestSuite suite = new TestSuite(s.getName());
        session.addSuite(suite);
        Manager.getInstance().displaySuiteRunning(session, suite.getName());
        if (s.getStderr() != null) {
            // XXX TR window does not seem to show only stdio from selected suite
            Manager.getInstance().displayOutput(session, s.getStderr(), true);
        }
        if (s.getStdout() != null) {
            Manager.getInstance().displayOutput(session, s.getStdout(), false);
        }
        for (final FailureDataDisplayer.Case c : s.getCases()) {
            if (c.getErrorStackTrace() == null) {
                continue;
            }
            String name = c.getClassName() + "." + c.getName(); //NOI18N
            String shortName = c.getName();
            if (s.getName() != null && !s.getName().equals(c.getClassName())) {
                shortName = name;
                name = Bundle.ShowFailures_from_suite(name, s.getName());
            }
            println();
            out.println("[" + name + "]"); // XXX use color printing to make it stand out? //NOI18N
            show(c.getErrorStackTrace(), /* err is too hard to read */ out);
            Testcase test = new Testcase(shortName, null, session);
            test.setClassName(c.getClassName());
            Trouble trouble = new Trouble(!ASSERTION_FAILURE.matcher(c.getErrorStackTrace()).lookingAt());
            trouble.setStackTrace(c.getErrorStackTrace().split("\r?\n")); //NOI18N
            // XXX call setComparisonFailure if matches "expected:<...> but was:<...>"
            test.setTrouble(trouble);
            LOG.log(Level.FINE, "got {0} as {1}", new Object[]{name, test.getStatus()}); //NOI18N
            test.setTimeMillis(c.getDuration());
            session.addTestCase(test);
        }
        if (s.getStderr() != null || s.getStdout() != null) {
            println();
            show(s.getStderr(), err);
            show(s.getStdout(), out);
        }
        Manager.getInstance().displayReport(session, session.getReport(s.getDuration()));
    }
    boolean firstLine = true;

    void println() {
        if (firstLine) {
            firstLine = false;
        } else {
            io.getOut().println();
        }
    }

    void show(String lines, OutputWriter w) {
        if (lines == null) {
            return;
        }
        for (String line : lines.split("\r\n?|\n")) { //NOI18N
            hyperlinker.handleLine(line, w);
        }
    }

    @Override
    public void close() {
        if (io != null) {
            io.getOut().close();
            io.getErr().close();
            Manager.getInstance().sessionFinished(session);
        }
    }

    private class HudsonTestRunnerNodeFactory extends TestRunnerNodeFactory {

        public HudsonTestRunnerNodeFactory() {
        }

        public @Override
        TestsuiteNode createTestSuiteNode(String suiteName, boolean filtered) {
            // XXX could add OpenableInBrowser
            return new TestsuiteNode(suiteName, filtered);
        }

        public @Override
        org.openide.nodes.Node createTestMethodNode(final Testcase testcase,
                Project project) {
            return new TestMethodNode(testcase, project) {
                public @Override
                Action[] getActions(boolean context) {
                    return new Action[]{
                        OpenUrlAction.forOpenable(new OpenableInBrowser() {
                            public @Override
                            String getUrl() {
                                return getUrl() + "testReport/"
                                        + testcase.getClassName().replaceFirst("[.][^.]+$", "") + "/" + testcase.getClassName().replaceFirst(".+[.]", "") + "/" + testcase.getName() + "/"; //NOI18N
                            }
                        }),
                        new DiffViewAction(testcase),};
                }
            };
        }

        public @Override
        org.openide.nodes.Node createCallstackFrameNode(String frameInfo, String displayName) {
            return new CallstackFrameNode(frameInfo, displayName) {
                public @Override
                Action getPreferredAction() {
                    return new AbstractAction(Bundle.LBL_GotoSource()) {
                        public @Override
                        void actionPerformed(ActionEvent e) {
                            // XXX should have utility API to parse stack traces
                            final Matcher m = Pattern.compile("\tat (.+[.])[^.]+[.][^.]+[(]([^.]+[.]java):([0-9]+)[)]").matcher(frameInfo); //NOI18N
                            if (m.matches()) {
                                final String resource = m.group(1).replace('.', '/') + m.group(2);
                                RP.post(new Runnable() {
                                    @Override
                                    public void run() {
                                        FileObject f = GlobalPathRegistry.getDefault().findResource(resource);
                                        LOG.log(Level.FINER, "matched {0} -> {1}", new Object[]{resource, f}); //NOI18N
                                        if (f != null) {
                                            HudsonLoggerHelper.openAt(f, Integer.parseInt(m.group(3)) - 1, -1, true);
                                        } else {
                                            StatusDisplayer.getDefault().setStatusText(Bundle.no_source_to_hyperlink(resource));
                                        }
                                    }
                                });
                            } else {
                                LOG.log(Level.FINER, "no match for {0}", frameInfo); //NOI18N
                            }
                        }
                    };
                }

                public @Override
                Action[] getActions(boolean context) {
                    return new Action[]{getPreferredAction()};
                }
            };
        }
    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 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 2013 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.impl;

import java.awt.EventQueue;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.modules.hudson.spi.HudsonLogger;
import org.openide.cookies.EditorCookie;
import org.openide.cookies.LineCookie;
import org.openide.cookies.OpenCookie;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.text.Line;

/**
 * Utilities for use by a logger.
 */
public class HudsonLoggerHelper {

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

    /**
     * Try to open a file, possibly at a given position.
     *
     * @param f a file to open
     * @param row the row number (zero-based), or -1 for none
     * @param col the column number (zero-based), or -1 for none
     * @param force true to forcibly open the file, false to just scroll if
     * already open
     */
    public static void openAt(FileObject f, int row, final int col, final boolean force) {
        try {
            DataObject d = DataObject.find(f);
            if (row == -1) {
                if (force) {
                    Runnable r;
                    final EditorCookie c = d.getLookup().lookup(EditorCookie.class);
                    if (c != null) {
                        r = new Runnable() {
                            public void run() {
                                try {
                                    c.openDocument();
                                } catch (IOException x) {
                                    LOG.log(Level.INFO, null, x);
                                }
                            }
                        };
                    } else {
                        LOG.fine("no EditorCookie found for " + f);
                        final OpenCookie o = d.getLookup().lookup(OpenCookie.class);
                        if (o == null) {
                            LOG.fine("no OpenCookie found for " + f);
                            return;
                        }
                        r = new Runnable() {
                            public void run() {
                                o.open();
                            }
                        };
                    }
                    EventQueue.invokeLater(r);
                }
                return;
            }
            LineCookie c = d.getLookup().lookup(LineCookie.class);
            if (c == null) {
                LOG.fine("no LineCookie found for " + f);
                openAt(f, -1, -1, force);
                return;
            }
            try {
                final Line l = c.getLineSet().getOriginal(row);
                EventQueue.invokeLater(new Runnable() {
                    public void run() {
                        l.show(force ? Line.ShowOpenType.REUSE : Line.ShowOpenType.NONE,
                                force ? Line.ShowVisibilityType.FOCUS : Line.ShowVisibilityType.FRONT, col);
                    }
                });
            } catch (IndexOutOfBoundsException x) {
                LOG.log(Level.INFO, null, x);
            }
        } catch (IOException x) {
            LOG.log(Level.INFO, null, x);
        }
    }

}

Lines 40-46 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/impl/JavaHudsonLogger.java (-2 / +2 lines)
40	* Portions Copyrighted 2009 Sun Microsystems, Inc.	40	* Portions Copyrighted 2009 Sun Microsystems, Inc.
41	*/	41	*/
42		42
43	package org.netbeans.modules.hudson.impl;	43	package org.netbeans.modules.hudson.ui.impl;
44		44
45	import java.awt.Toolkit;	45	import java.awt.Toolkit;
46	import java.io.IOException;	46	import java.io.IOException;
Lines 128-134 Link Here
128	if (source != null) {	128	if (source != null) {
129	// XXX possible to also display exception message in status line	129	// XXX possible to also display exception message in status line
130	// (would need to have grepped output for EXCEPTION_MESSAGE)	130	// (would need to have grepped output for EXCEPTION_MESSAGE)
131	Helper.openAt(source, lineNumber - 1, -1, force);	131	HudsonLoggerHelper.openAt(source, lineNumber - 1, -1, force);
132	} else if (force) {	132	} else if (force) {
133	Toolkit.getDefaultToolkit().beep();	133	Toolkit.getDefaultToolkit().beep();
134	}	134	}




 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.impl;

import java.util.prefs.Preferences;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider;
import org.openide.util.lookup.ServiceProvider;

/**




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 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 2013 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.impl;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.modules.hudson.api.HudsonChangeAdapter;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider;
import org.netbeans.modules.hudson.spi.HudsonManagerAgent;
import org.netbeans.modules.hudson.ui.notification.ProblemNotificationController;
import org.openide.util.Exceptions;
import org.openide.util.RequestProcessor;
import org.openide.util.lookup.ServiceProvider;

/**
 *
 * @author jhavlin
 */
@ServiceProvider(service = HudsonManagerAgent.class)
public class OpenProjectstHudsonManagerAgent extends HudsonManagerAgent {

    private static final RequestProcessor RP
            = new RequestProcessor(OpenProjectstHudsonManagerAgent.class);
    private final PropertyChangeListener projectsListener;
    private final Map<Project, HudsonInstance> projectInstances
            = new HashMap<Project, HudsonInstance>();
    private final Map<HudsonInstance, ProblemNotificationController> notifications
            = new HashMap<HudsonInstance, ProblemNotificationController>();

    /**
     * Mapping from Hudson instance to one or more providers (projects).
     */
    private final Map<HudsonInstance, List<Project>> instanceProviders
            = new HashMap<HudsonInstance, List<Project>>();
    private final RequestProcessor.Task checkOpenProjects = RP.create(new Runnable() {
        public @Override
        void run() {
            checkOpenProjects();
        }
    });

    public OpenProjectstHudsonManagerAgent() {
        projectsListener = new PropertyChangeListener() {
            @Override
            public void propertyChange(PropertyChangeEvent evt) {
                if (OpenProjects.PROPERTY_OPEN_PROJECTS.equals(
                        evt.getPropertyName())) {
                    checkOpenProjects.schedule(0);
                }
            }
        };
    }

    @Override
    public void start() {
        OpenProjects.getDefault().addPropertyChangeListener(projectsListener);
        checkOpenProjects.schedule(0);
    }

    @Override
    public void terminate() {
        OpenProjects.getDefault().removePropertyChangeListener(projectsListener);
        projectInstances.clear();
    }

    private synchronized void checkOpenProjects() {
        try {
            Future<Project[]> fut = OpenProjects.getDefault().openProjects();
            Project[] prjs = fut.get();
            for (Project project : prjs) {
                boolean exists = projectInstances.containsKey(project);
                ProjectHudsonProvider.Association assoc
                        = ProjectHudsonProvider.getDefault().findAssociation(project);
                if (assoc != null && !exists) {
                    String url = assoc.getServerUrl();
                    HudsonInstance in = HudsonManager.getInstance(url);
                    if (in == null) {
                        String n = HudsonManager.simplifyServerLocation(url, false);
                        in = HudsonManager.addInstance(n, url, 60, false);
                    }
                    addProvider(in, project);
                    projectInstances.put(project, in);
                } else if (assoc == null && exists) {
                    HudsonInstance remove = projectInstances.remove(project);
                    if (remove != null) {
                        removeProvider(remove, project);
                        if (!hasProvider(remove)) {
                            HudsonManager.removeInstance(remove);
                        }
                    }
                }
            }
            ArrayList<Project> newprjs = new ArrayList<Project>(projectInstances.keySet());
            newprjs.removeAll(Arrays.asList(prjs));
            for (Project project : newprjs) {
                HudsonInstance remove = projectInstances.remove(project);
                if (remove != null && hasProvider(remove)
                        && !remove.isPersisted()) {
                    removeProvider(remove, project);
                    if (!hasProvider(remove)) {
                        HudsonManager.removeInstance(remove);
                    }
                }
            }
        } catch (InterruptedException ex) {
            Exceptions.printStackTrace(ex);
        } catch (ExecutionException ex) {
            Exceptions.printStackTrace(ex);
        }
    }

    private void addProvider(HudsonInstance instance, Project project) {
        List<Project> providers = instanceProviders.get(instance);
        if (providers == null) {
            providers = new ArrayList<Project>();
            instanceProviders.put(instance, providers);
        }
        if (!providers.contains(project)) {
            providers.add(project);
        }
        setPreferredJobs(instance);
    }

    private void removeProvider(HudsonInstance instance, Project project) {
        List<Project> providers = instanceProviders.get(instance);
        if (providers != null) {
            providers.remove(project);
            if (providers.isEmpty()) {
                instanceProviders.remove(instance);
            }
        }
        setPreferredJobs(instance);
    }

    private boolean hasProvider(HudsonInstance instance) {
        List<Project> providers = instanceProviders.get(instance);
        if (providers == null) {
            return false;
        } else {
            if (providers.isEmpty()) {
                instanceProviders.remove(instance);
                return false;
            } else {
                return true;
            }
        }
    }

    private List<Project> getProviders(HudsonInstance instance) {
        return instanceProviders.get(instance);
    }

    private void setPreferredJobs(HudsonInstance instance) {
        List<Project> providers = getProviders(instance);
        if (providers == null) {
            return;
        }
        List<String> names = new ArrayList<String>();
        for (Project prj : providers) {
            ProjectHudsonProvider.Association assoc
                    = ProjectHudsonProvider.getDefault().findAssociation(prj);
            if (assoc != null) {
                String name = assoc.getJobName();
                if (name != null) {
                    names.add(name);
                }
            }
        }
        instance.setPreferredJobs(names);
    }

    @Override
    public void instanceAdded(HudsonInstance instance) {
        final ProblemNotificationController controller =
                new ProblemNotificationController(instance);
        instance.addHudsonChangeListener(new HudsonChangeAdapter() {

            @Override
            public void contentChanged() {
                controller.updateNotifications();
            }
        });
        notifications.put(instance, controller);
    }

    @Override
    public void instanceRemoved(HudsonInstance instance) {
        ProblemNotificationController c = notifications.remove(instance);
        if (c != null) {
            c.clearNotifications();
        }
    }
}




 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.impl;

import java.awt.Toolkit;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;

import org.netbeans.modules.hudson.spi.HudsonLogger;
import org.netbeans.modules.hudson.spi.HudsonLogger.HudsonLogSession;
import org.netbeans.modules.hudson.spi.HudsonSCM;
import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider;
import org.openide.awt.HtmlBrowser.URLDisplayer;
import org.openide.awt.StatusDisplayer;
import org.openide.filesystems.FileObject;

import org.openide.windows.OutputEvent;
import org.openide.windows.OutputListener;
import org.openide.windows.OutputWriter;
import static org.netbeans.modules.hudson.ui.actions.Bundle.*;

@ServiceProvider(service=HudsonLogger.class, position = Integer.MAX_VALUE - 100)
public class PlainLogger implements HudsonLogger {
 */
public class Hyperlinker {

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

    @Override
    public HudsonLogSession createSession(final HudsonJob job) {
            return new HudsonLogSession() {
                final PlainLoggerLogic logic = new PlainLoggerLogic(job, job.getName());
                public boolean handle(String line, OutputWriter stream) {
                    OutputListener link = logic.findHyperlink(line);
                    if (link != null) {
                        try {
                            stream.println(line, link);
                            return true;
                        } catch (IOException x) {
                            LOG.log(Level.INFO, null, x);
                        }
                    }
                    stream.println(line);
                    return true;
                }
            };
        }
        sessions = _sessions.toArray(new HudsonLogSession[_sessions.size()]);
    }

    public void handleLine(String line, OutputWriter stream) {
        for (HudsonLogSession session : sessions) {
            if (session.handle(line, stream)) {
                break;
            }
        }
        // PlainLogger is last and always handles it
    }

    static class PlainLoggerLogic {
        private static final Pattern REMOTE_URL = Pattern.compile("\\b(https?://[^\\s)>]+)");

        }
    }

    @ServiceProvider(service=HudsonLogger.class)
    public static final class PlainLogger implements HudsonLogger {
        public HudsonLogSession createSession(final HudsonJob job) {
            return new HudsonLogSession() {
                final PlainLoggerLogic logic = new PlainLoggerLogic(job, job.getName());
                public boolean handle(String line, OutputWriter stream) {
                    OutputListener link = logic.findHyperlink(line);
                    if (link != null) {
                        try {
                            stream.println(line, link);
                            return true;
                        } catch (IOException x) {
                            LOG.log(Level.INFO, null, x);
                        }
                    }
                    stream.println(line);
                    return true;
                }
            };
        }
    }

    private static class Hyperlink implements OutputListener {

        private static final RequestProcessor RP = new RequestProcessor(Hyperlink.class);

            this.col = col;
        }

        @Override
        public void outputLineAction(OutputEvent ev) {
            acted(true);
        }

        @Override
        public void outputLineSelected(OutputEvent ev) {
            acted(false);
        }

        @Messages({"# {0} - file path in workspace", "Hyperlinker.looking_for=Looking for {0}...", "# {0} - file path in workspace", "Hyperlinker.not_found=No file {0} found in remote workspace."})
        private void acted(final boolean force) {
            RP.post(new Runnable() {
                @Override
                public void run() {
                    FileObject f = null;
                    Project p = ProjectHudsonProvider.getDefault().findAssociatedProject(ProjectHudsonProvider.Association.forJob(job));

                        // XXX #159829: consider aligning local line number with remote line number somehow
                    }
                    if (f == null) {
                        StatusDisplayer.getDefault().setStatusText(Bundle.Hyperlinker_looking_for(path));
                        f = job.getRemoteWorkspace().findResource(path);
                        LOG.log(Level.FINE, "Tried to find remote file at {0} using {1}", new Object[] {f, path});
                    }
                    if (f == null) {
                        if (force) {
                        StatusDisplayer.getDefault().setStatusText(Bundle.Hyperlinker_not_found(path));
                            Toolkit.getDefaultToolkit().beep();
                        }
                        return;
                    }
                    // XXX could be useful to select this file in the workspace node (see related #159838)
                    StatusDisplayer.getDefault().setStatusText(message);
                    HudsonLoggerHelper.openAt(f, row, col, force);
                }
            });
        }

        @Override
        public void outputLineCleared(OutputEvent ev) {}

        public @Override String toString() {

            this.u = u;
        }

        @Override
        public void outputLineAction(OutputEvent ev) {
            URLDisplayer.getDefault().showURL(u);
        }

        @Override
        public void outputLineSelected(OutputEvent ev) {}

        @Override
        public void outputLineCleared(OutputEvent ev) {}

        public @Override String toString() {




 * Portions Copyrighted 2011 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.impl;

import java.util.Locale;
import org.netbeans.modules.hudson.Installer;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.ui.api.UI;
import org.netbeans.modules.hudson.api.Utilities;
import org.netbeans.spi.quicksearch.SearchProvider;
import org.netbeans.spi.quicksearch.SearchRequest;
import org.netbeans.spi.quicksearch.SearchResponse;
import static org.netbeans.modules.hudson.ui.Bundle.*;
import org.openide.util.NbBundle.Messages;

@Messages("quicksearch=Hudson") // QuickSearch/Hudson#displayName

        if (text == null) {
            return;
        }
        if (!Utilities.isHudsonSupportActive()) {
            return;
        }
        work(text, response);


    @Messages({"# {0} - server label", "# {1} - job name", "search_response=Hudson job {1} on {0}"})
    private void work(String text, SearchResponse response) {
        for (final HudsonInstance instance : HudsonManager.getAllInstances()) {
            for (HudsonJob job : instance.getJobs()) {
                final String name = job.getName();
                // XXX could also search for text in instance name, and/or Maven modules

                        @Override public void run() {
                            UI.selectNode(instance.getUrl(), name);
                        }
                    }, Bundle.search_response(instance.getName(), name))) {
                        return;
                    }
                }

Lines 51-57 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/nodes/HudsonFolderNode.java (-1 / +1 lines)
51	import org.netbeans.modules.hudson.api.HudsonFolder;	51	import org.netbeans.modules.hudson.api.HudsonFolder;
52	import org.netbeans.modules.hudson.api.HudsonJob;	52	import org.netbeans.modules.hudson.api.HudsonJob;
53	import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;	53	import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;
54	import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;	54	import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
55	import org.openide.filesystems.FileUtil;	55	import org.openide.filesystems.FileUtil;
56	import org.openide.loaders.DataFolder;	56	import org.openide.loaders.DataFolder;
57	import org.openide.nodes.AbstractNode;	57	import org.openide.nodes.AbstractNode;




package org.netbeans.modules.hudson.ui.nodes;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;

import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJob.Color;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.api.HudsonVersion;
import org.netbeans.modules.hudson.api.HudsonView;
import org.netbeans.modules.hudson.api.Utilities;
import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
import org.netbeans.modules.hudson.impl.HudsonManagerImpl;
import static org.netbeans.modules.hudson.ui.nodes.Bundle.*;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.openide.nodes.PropertySupport;
import org.openide.nodes.Sheet;
import org.openide.util.NbBundle.Messages;
import org.openide.util.Union2;
import org.openide.util.lookup.Lookups;

    
    private static final String ICON_BASE = "org/netbeans/modules/hudson/ui/resources/instance.png"; // NOI18N
    
    private final HudsonInstance instance;
    private Sheet.Set set;
    
    private boolean warn = false;
    private boolean run = false;

    private boolean forbidden;
    private boolean version = false;
    
    public HudsonInstanceNode(final HudsonInstance instance) {
        super(new InstanceNodeChildren(instance), Lookups.singleton(instance));
        
        setName(instance.getUrl());

    }

    public @Override void destroy() throws IOException {
        HudsonManager.removeInstance(instance);
    }

    public @Override PropertySet[] getPropertySets() {
        return new PropertySet[] {getSheetSet()};
    }
    
    @Messages({
        "TXT_Instance_Prop_Name=Name",
        "DESC_Instance_Prop_Name=Hudson's instance name",
        "TXT_Instance_Prop_Url=URL",
        "DESC_Instance_Prop_Url=Hudson's instance URL",
        "TXT_Instance_Prop_Sync=Autosynchronization time",
        "DESC_Instance_Prop_Sync=Autosynchronization time in minutes (if it's 0 the autosynchronization is off)"
    })
    private Sheet.Set getSheetSet() {
        if (null == set) {
            set = Sheet.createPropertiesSet();

            // Set display name
            set.setDisplayName(instance.getName());

            // Put properties in
            set.put(new Node.Property<?>[]{
                new PropertySupport<String>("name", String.class, //NOI18N
                TXT_Instance_Prop_Name(),
                DESC_Instance_Prop_Name(),
                true, false) {

                    @Override
                    public String getValue() {
                        return instance.getName();
                    }

                    @Override
                    public void setValue(String val) {
                    }
                },
                new PropertySupport<String>("url", String.class, //NOI18N
                TXT_Instance_Prop_Url(),
                DESC_Instance_Prop_Url(),
                true, false) {

                    @Override
                    public String getValue() throws IllegalAccessException, InvocationTargetException {
                        return instance.getUrl();
                    }

                    @Override
                    public void setValue(String val) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
                    }
                },
                new PropertySupport<Integer>("sync", Integer.class, //NOI18N
                TXT_Instance_Prop_Sync(),
                DESC_Instance_Prop_Sync(),
                true, true) {
                    @Override
                    public Integer getValue() {
                        return instance.getSyncInterval();
                    }

                    @Override
                    public void setValue(Integer val) {
                        if (val == null || val < 0) {
                            throw new IllegalArgumentException();
                        }
                        instance.setSyncInterval(val);
                    }

                    public @Override
                    boolean canWrite() {
                        return instance.isPersisted();
                    }
                }
            });
        }

        return set;
    }

    private synchronized void refreshState() {
        alive = instance.isConnected();
        forbidden = instance.isForbidden();

    
    private static class InstanceNodeChildren extends Children.Keys<Union2<HudsonJob,HudsonFolder>> implements HudsonChangeListener {
        
        private final HudsonInstance instance;
        
        InstanceNodeChildren(HudsonInstance instance) {
            this.instance = instance;
            instance.addHudsonChangeListener(this);
            instance.prefs().addPreferenceChangeListener(new PreferenceChangeListener() {




import org.netbeans.modules.hudson.api.HudsonJob.Color;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.api.Utilities;
import org.netbeans.modules.hudson.ui.api.UI;
import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;
import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.ChildFactory;
import org.openide.nodes.Children;

        if (build.isBuilding()) {
            effectiveColor = build.getJob().getColor();
        } else {
            effectiveColor = Utilities.getColorForBuild(build);
        }
        try {
            htmlDisplayName = effectiveColor.colorizeDisplayName(XMLUtil.toElementContent(getDisplayName()));




import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.CharConversionException;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Action;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJob.Color;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.constants.HudsonInstanceConstants;
import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
import org.netbeans.modules.hudson.impl.HudsonJobImpl;
import org.netbeans.modules.hudson.ui.actions.LogInAction;
import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;
import org.netbeans.modules.hudson.ui.actions.ProjectAssociationAction;
import org.netbeans.modules.hudson.ui.actions.StartJobAction;
import org.netbeans.modules.hudson.ui.actions.ViewConfigAction;
import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
import org.netbeans.modules.hudson.constants.HudsonInstanceConstants;
import org.netbeans.modules.hudson.constants.HudsonJobConstants;
import org.netbeans.modules.hudson.ui.actions.ProjectAssociationAction;
import static org.netbeans.modules.hudson.ui.nodes.Bundle.*;
import org.openide.actions.PropertiesAction;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.ChildFactory;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.openide.nodes.PropertySupport;
import org.openide.nodes.Sheet;
import org.openide.util.NbBundle.Messages;
import org.openide.util.WeakListeners;

    private String htmlDisplayName;
    private HudsonJob job;
    private PropertyChangeListener watchedListener;
    private Sheet.Set set;
    
    public HudsonJobNode(HudsonJob job) {
        super(makeChildren(job), Lookups.singleton(job));

    @Override
    public Action[] getActions(boolean context) {
        if (job.getColor() == Color.secured) {
            return new Action[] {new LogInAction(job.getInstance())};
        }
        List<Action> actions = new ArrayList<Action>();
        actions.add(SystemAction.get(StartJobAction.class));

        Sheet s = super.createSheet();
        
        // Put properties in
        s.put(getSheetSet()); // XXX is cast necessary?
        
        return s;
    }
    
    @Messages({
        "TXT_Job_Prop_Name=Name",
        "DESC_Job_Prop_Name=Hudson's job name",
        "TXT_Job_Prop_Url=URL",
        "DESC_Job_Prop_Url=Hudson's job URL",
        "HudsonJobImpl.watched=Watched",
        "HudsonJobImpl.watched_desc=Whether you wish to be notified of failures in this job."
    })
    private Sheet.Set getSheetSet() {
        if (null == set) {
            set = Sheet.createPropertiesSet();

            // Set display name
            set.setDisplayName(getDisplayName());

            // Put properties in
            set.put(new Node.Property<?>[]{
                new PropertySupport<String>(HudsonJobConstants.JOB_NAME, String.class,
                TXT_Job_Prop_Name(),
                DESC_Job_Prop_Name(), true, false) {

                    @Override
                    public String getValue() {
                        return job.getName();
                    }

                    @Override
                    public void setValue(String val) {
                    }
                },
                new PropertySupport<String>(HudsonJobConstants.JOB_URL, String.class,
                TXT_Job_Prop_Url(),
                DESC_Job_Prop_Url(), true, false) {

                    @Override
                    public String getValue() throws IllegalAccessException, InvocationTargetException {
                        return job.getUrl();
                    }

                    @Override
                    public void setValue(String val) {
                    }

                },
                new PropertySupport.ReadWrite<Boolean>("salient", Boolean.TYPE, // NOI18N
                HudsonJobImpl_watched(),
                HudsonJobImpl_watched_desc()) {
                    @Override
                    public Boolean getValue() {
                        return job.isSalient();
                    }

                    @Override
                    public void setValue(Boolean val) {
                        if (!getValue().equals(val)) {
                            job.setSalient(val);
                        }
                    }
                }
            });
            jobImpl.getInstance().getProperties().addPropertyChangeListener(
                    WeakListeners.propertyChange(watchedListener,
                    jobImpl.getInstance().getProperties()));
        }
        return set;
    }

    private void setWatchedListener() {

        watchedListener = new PropertyChangeListener() {
            @Override
            public void propertyChange(PropertyChangeEvent evt) {
                if (evt.getPropertyName().equals(
                        HudsonInstanceConstants.INSTANCE_SUPPRESSED_JOBS)) {
                    setHudsonJob(HudsonJobNode.this.job);
                }
            }
        };
        job.getInstance().addPropertyChangeListener(
                WeakListeners.propertyChange(watchedListener,
                job.getInstance()));
    }

    @Messages({

Lines 47-55 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/nodes/HudsonMavenModuleBuildNode.java (-2 / +2 lines)
47	import java.util.List;	47	import java.util.List;
48	import javax.swing.Action;	48	import javax.swing.Action;
49	import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;	49	import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
50	import org.netbeans.modules.hudson.api.UI;	50	import org.netbeans.modules.hudson.ui.api.UI;
51	import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;	51	import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;
52	import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;	52	import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
53	import org.openide.nodes.AbstractNode;	53	import org.openide.nodes.AbstractNode;
54	import org.openide.nodes.ChildFactory;	54	import org.openide.nodes.ChildFactory;
55	import org.openide.nodes.Children;	55	import org.openide.nodes.Children;




import javax.swing.Action;
import org.netbeans.api.core.ide.ServicesTabNodeRegistration;
import org.netbeans.modules.hudson.api.HudsonChangeListener;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.ui.actions.AddInstanceAction;
import static org.netbeans.modules.hudson.ui.nodes.Bundle.*;
import org.openide.nodes.AbstractNode;

        return actions.toArray(new Action[actions.size()]);
    }
    
    private static class RootNodeChildren extends ChildFactory<HudsonInstance> implements HudsonChangeListener {
        
        public RootNodeChildren() {
            HudsonManager.addHudsonChangeListener(this);
        }

        protected @Override Node createNodeForKey(HudsonInstance key) {
            return new HudsonInstanceNode(key);
        }
        
        @Override
        protected boolean createKeys(List<HudsonInstance> toPopulate) {
            toPopulate.addAll(HudsonManager.getAllInstances());
            Collections.sort(toPopulate);
            return true;
        }

        @Override
        public void stateChanged() {}
        
        @Override
        public void contentChanged() {
            refresh(false);
        }




import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.ui.api.UI;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.awt.Notification;

import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle.Messages;
import org.openide.util.RequestProcessor;
import static org.netbeans.modules.hudson.ui.notification.Bundle.*;
import org.openide.awt.NotificationDisplayer.Category;
import org.openide.util.lookup.Lookups;


    })
    private String getTitle() {
        // XXX use HudsonJobBuild.getDisplayName
        return failed ? Bundle.ProblemNotification_title_failed(job.getDisplayName(), build) : Bundle.ProblemNotification_title_unstable(job.getDisplayName(), build);
    }

    @Messages({

        "ProblemNotification.description.unstable=Some tests failed."
    })
    String showFailureText() {
        return failed ? Bundle.ProblemNotification_description_failed() : Bundle.ProblemNotification_description_unstable();
    }

    void showFailure() {
        // BuildHandleImpl.getDefaultAction similar but not identical.
        UI.selectNode(job.getInstance().getUrl(), job.getName(), Integer.toString(build));
        RequestProcessor.getDefault().post(new Runnable() {
            @Override
            public void run() {
                for (HudsonJobBuild b : job.getBuilds()) {
                    if (b.getNumber() == build) {

    })
    void ignore() { // #161601
        if (DialogDisplayer.getDefault().notify(new NotifyDescriptor.Confirmation(
                Bundle.ProblemNotification_ignore_question(job.getDisplayName(), job.getInstance().getName()),
                Bundle.ProblemNotification_ignore_title(job.getDisplayName()),
                NotifyDescriptor.OK_CANCEL_OPTION)) == NotifyDescriptor.OK_OPTION) {
            job.setSalient(false);
        }




import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.prefs.Preferences;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJob.Color;
import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;

public class ProblemNotificationController {

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

    private final HudsonInstance instance;
    private final Set<ProblemNotification> notifications = new HashSet<ProblemNotification>();

    public ProblemNotificationController(HudsonInstance instance) {
        this.instance = instance;
    }





 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.spi;

import java.io.File;
import java.io.IOException;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.event.ChangeListener;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.modules.hudson.spi.HudsonSCM;
import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
import org.openide.util.Lookup;
import org.openide.util.NbBundle.Messages;
import static org.netbeans.modules.hudson.spi.Bundle.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;


    }

    /**
     * Return value of {@link ProjectHudsonJobCreator#error}.
     */
    final class ConfigurationStatus {

        private String errorMessage;
        private String warningMessage;
        private JButton extraButton;

        private ConfigurationStatus() {}

        /** Creates a valid configuration. */
        public static ConfigurationStatus valid() {
            return new ConfigurationStatus();
        }

        /** Creates a configuration with a fatal error. */
        public static ConfigurationStatus withError(String error) {
            ConfigurationStatus s = new ConfigurationStatus();
            s.errorMessage = error;
            return s;
        }

        /** Creates a configuration with a nonfatal warning. */
        public static ConfigurationStatus withWarning(String warning) {
            ConfigurationStatus s = new ConfigurationStatus();
            s.warningMessage = warning;
            return s;
        }

        /**
         * Creates a similar configuration but with an extra button added to the dialog.
         * @see NotifyDescriptor#setAdditionalOptions
         */
        public ConfigurationStatus withExtraButton(JButton extraButton) {
            if (this.extraButton != null) {
                throw new IllegalArgumentException();
            }
            ConfigurationStatus s = new ConfigurationStatus();
            s.errorMessage = errorMessage;
            s.warningMessage = warningMessage;
            s.extraButton = extraButton;
            return s;
        }

        /** for internal use only */
        public String getErrorMessage() {
            return errorMessage;
        }

        /** for internal use only */
        public String getWarningMessage() {
            return warningMessage;
        }

        /** for internal use only */
        public JButton getExtraButton() {
            return extraButton;
        }

    }

    /**
     * Utilities which can be used by {@link ProjectHudsonJobCreator#configure}.
     */
    public final class Helper {

        private Helper() {}


         */
        @Messages("ProjectHudsonJobCreatorFactory.no_vcs=The project does not use any supported version control system.")
        public static ConfigurationStatus noSCMError() {
            return ConfigurationStatus.withError(Bundle.ProjectHudsonJobCreatorFactory_no_vcs());
        }

        /**




 * made subject to such option by the copyright holder.
 */

package org.netbeans.modules.hudson.ui.spi;

import java.net.URI;
import java.util.Arrays;

import org.netbeans.modules.hudson.api.HudsonFolder;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.api.Utilities;
import org.openide.util.Lookup;


            if (jobPath == null || jobPath.length < 2) { // no job name
                return null;
            }
            HudsonInstance instance = HudsonManager.getInstance(jobPath[0]);
            if (instance == null) {
                return null;
            }

Lines 39-45 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/util/UsageLogging.java (-1 / +1 lines)
39	*	39	*
40	* Portions Copyrighted 2011 Sun Microsystems, Inc.	40	* Portions Copyrighted 2011 Sun Microsystems, Inc.
41	*/	41	*/
42	package org.netbeans.modules.hudson.util;	42	package org.netbeans.modules.hudson.ui.util;
43		43
44	import java.util.ResourceBundle;	44	import java.util.ResourceBundle;
45	import java.util.logging.Level;	45	import java.util.logging.Level;




import javax.swing.JButton;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.api.HudsonVersion;
import org.netbeans.modules.hudson.api.UI;
import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
import org.netbeans.modules.hudson.api.Utilities;
import org.netbeans.modules.hudson.ui.api.UI;
import org.netbeans.modules.hudson.ui.util.UsageLogging;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;

                    problem(NbBundle.getMessage(InstanceDialog.class, "MSG_FailedToConnect"));
                    return;
                }
                created = HudsonManager.addInstance(panel.getDisplayName(), panel.getUrl(), panel.getSyncTime(), true);
                EventQueue.invokeLater(new Runnable() {
                    public void run() {
                        dialog.dispose();




import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.openide.NotificationLineSupport;
import org.openide.util.NbBundle;


            msgs.setInformationMessage(NbBundle.getMessage(InstanceDialog.class, "MSG_EmptyName"));
            return;
        }
        if (HudsonManager.getInstanceByName(name) != null) {
            msgs.setErrorMessage(NbBundle.getMessage(InstanceDialog.class, "MSG_ExistName"));
            return;
        }

            msgs.setErrorMessage(x.getLocalizedMessage());
            return;
        }
        if (HudsonManager.getInstance(url) != null) {
            msgs.setErrorMessage(NbBundle.getMessage(InstanceDialog.class, "MSG_ExistUrl"));
            return;
        }




 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.impl;

import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.hudson.ui.impl.PlainLogger.PlainLoggerLogic;

public class PlainLoggerTest extends NbTestCase {

    public PlainLoggerTest(String n) {
        super(n);
    }


Lines 40-49 Link Here

(-)a/hudson/test/unit/src/org/netbeans/modules/hudson/spi/ProjectHudsonProviderTest.java (-2 / +2 lines)
40	* Portions Copyrighted 2009 Sun Microsystems, Inc.	40	* Portions Copyrighted 2009 Sun Microsystems, Inc.
41	*/	41	*/
42		42
43	package org.netbeans.modules.hudson.spi;	43	package org.netbeans.modules.hudson.ui.spi;
44		44
45	import org.netbeans.junit.NbTestCase;	45	import org.netbeans.junit.NbTestCase;
46	import org.netbeans.modules.hudson.spi.ProjectHudsonProvider.Association;	46	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider.Association;
47		47
48	public class ProjectHudsonProviderTest extends NbTestCase {	48	public class ProjectHudsonProviderTest extends NbTestCase {
49		49

Lines 2-6 Link Here

(-)a/hudson/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.hudson	2	OpenIDE-Module: org.netbeans.modules.hudson
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/Bundle.properties
4	OpenIDE-Module-Layer: org/netbeans/modules/hudson/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/hudson/layer.xml
5	OpenIDE-Module-Specification-Version: 1.34	5	OpenIDE-Module-Specification-Version: 2.0
6		6




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core.ide</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.15</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.libs.commons_net</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.diff</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.21</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.gsf.testrunner</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.26</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.keyring</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.5</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.16</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.23.0.6</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.spi.quicksearch</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.13</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.explorer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.18</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.27</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.text</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                <friend>org.netbeans.modules.hudson.php</friend>
                <friend>org.netbeans.modules.hudson.subversion</friend>
                <friend>org.netbeans.modules.hudson.tasklist</friend>
                <friend>org.netbeans.modules.hudson.ui</friend>
                <friend>org.netbeans.modules.odcs.hudson</friend>
                <package>org.netbeans.modules.hudson.api</package>
                <package>org.netbeans.modules.hudson.api.ui</package>
                <package>org.netbeans.modules.hudson.constants</package>
                <package>org.netbeans.modules.hudson.spi</package>
            </friend-packages>
        </data>

Lines 44-52 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/api/HudsonInstance.java (+60 lines)
44		44
45	package org.netbeans.modules.hudson.api;	45	package org.netbeans.modules.hudson.api;
46		46
		47	import java.beans.PropertyChangeListener;
47	import java.util.Collection;	48	import java.util.Collection;
		49	import java.util.List;
48	import java.util.prefs.Preferences;	50	import java.util.prefs.Preferences;
49	import javax.swing.Action;	51	import javax.swing.Action;
		52	import org.netbeans.api.annotations.common.CheckForNull;
		53	import org.netbeans.api.annotations.common.NullAllowed;
50	import org.openide.awt.ActionReference;	54	import org.openide.awt.ActionReference;
51		55
52	/**	56	/**
Lines 138-143 Link Here
138	Preferences prefs();	142	Preferences prefs();
139		143
140	/**	144	/**
		145	* Get list of preferred jobs.
		146	*
		147	* @return List of preferred jobs (can be empty), or null if no preferred
		148	* jobs have been set (i.e. all jobs are preferred).
		149	*/
		150	@CheckForNull List<String> getPreferredJobs();
		151
		152	/**
		153	* Set list of preferred jobs. Null can be passed, see
		154	* {@link #getPreferredJobs()}.
		155	*
		156	* Use with caution. Safer way to work with preferred jobs is using
		157	* {@link HudsonJob#setSalient(boolean)}.
		158	*
		159	* @param preferredJobs List of names of preferred jobs, can be null (i.e.
		160	* all jobs are preferred), or empty list (no job is preferred).
		161	*/
		162	void setPreferredJobs(@NullAllowed List<String> preferredJobs);
		163
		164	/**
		165	* Initiate synchronization: fetching refreshed job data from the server.
		166	* Will run asynchronously.
		167	*
		168	* @param login To prompt for login if the anonymous user cannot even see
		169	* the job list; set to true for explicit user gesture, false otherwise.
		170	*/
		171	void synchronize(boolean login);
		172
		173	/**
		174	* @return True if connection to the server if forbidden.
		175	*/
		176	boolean isForbidden();
		177
		178	/**
		179	* @return Info about persistence, and persistence-related features of the
		180	* instance.
		181	*/
		182	public Persistence getPersistence();
		183
		184	/**
		185	* @return Synchronization interval in minutes.
		186	*/
		187	public int getSyncInterval();
		188
		189	/**
		190	* Set synchronization interval.
		191	*
		192	* @param syncInterval New synchronization interval in minutes.
		193	*/
		194	public void setSyncInterval(int syncInterval);
		195
		196	public void addPropertyChangeListener(PropertyChangeListener listener);
		197
		198	public void removePropertyChangeListener(PropertyChangeListener listener);
		199
		200	/**
141	* Class holding info about Hudson instance persistence.	201	* Class holding info about Hudson instance persistence.
142	*	202	*
143	* @author jhavlin	203	* @author jhavlin

Lines 49-55 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/api/HudsonJob.java (-1 lines)
49	import java.util.logging.Logger;	49	import java.util.logging.Logger;
50	import org.netbeans.api.annotations.common.NonNull;	50	import org.netbeans.api.annotations.common.NonNull;
51	import org.openide.filesystems.FileSystem;	51	import org.openide.filesystems.FileSystem;
52	import org.openide.nodes.AbstractNode;
53		52
54	/**	53	/**
55	* Instance of the Hudson Job in specified instance	54	* Instance of the Hudson Job in specified instance

Lines 43-48 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/api/HudsonJobBuild.java (+29 lines)
43	package org.netbeans.modules.hudson.api;	43	package org.netbeans.modules.hudson.api;
44		44
45	import java.util.Collection;	45	import java.util.Collection;
		46	import org.netbeans.modules.hudson.spi.ConsoleDataDisplayerImpl;
		47	import org.netbeans.modules.hudson.spi.FailureDataDisplayerImpl;
46	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;	48	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;
47	import org.netbeans.modules.hudson.spi.HudsonSCM;	49	import org.netbeans.modules.hudson.spi.HudsonSCM;
48	import org.openide.filesystems.FileSystem;	50	import org.openide.filesystems.FileSystem;
Lines 89-92 Link Here
89	*/	91	*/
90	String getDisplayName();	92	String getDisplayName();
91		93
		94	/**
		95	* Check whether build console is supported by this build.
		96	*
		97	* @return True if the build console can be shown, false otherwise.
		98	*/
		99	boolean canShowConsole();
		100
		101	/**
		102	* Show console data using a displayer.
		103	*
		104	* @param displayer Displayer capable to display the console data.
		105	*/
		106	void showConsole(ConsoleDataDisplayerImpl displayer);
		107
		108	/**
		109	* Check whether build failures are supported by this build.
		110	*
		111	* @return True if build failures can be shown, false otherwise.
		112	*/
		113	boolean canShowFailures();
		114
		115	/**
		116	* Show build failures using a displayer.
		117	*
		118	* @param displayer Displayer capable to display the failure data.
		119	*/
		120	void showFailures(FailureDataDisplayerImpl displayer);
92	}	121	}





package org.netbeans.modules.hudson.api;

import java.util.Collection;
import static org.netbeans.modules.hudson.constants.HudsonInstanceConstants.*;
import org.netbeans.modules.hudson.api.HudsonInstance.Persistence;
import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;

            ((HudsonInstanceImpl) instance).synchronize(false);
        }
    }

    /**
     * Get an instance with specified URL.
     *
     * @param url URL of the instance.
     * @return The instance whose url equals to parameter {@code url}, or null
     * if no such instance exists.
     */
    public static HudsonInstance getInstance(String url) {
        return HudsonManagerImpl.getDefault().getInstance(url);
    }

    public static HudsonInstance getInstanceByName(String name) {
        return HudsonManagerImpl.getDefault().getInstanceByName(name);
    }

    /**
     * Get all registered instances.
     *
     * @return A collection containing all registered instances.
     */
    public static Collection<? extends HudsonInstance> getAllInstances() {
        return HudsonManagerImpl.getDefault().getInstances();
    }

    /**
     * Simplify server location. Remove protocol, and if {@code forKey} is true,
     * also replace slashes and colons with underscores.
     *
     * @param name Server name, usually a URL.
     * @param forKey True if the result will be used for key (slashes and colons
     * will be replaced with underscores), false otherwise (only protocol part
     * of the URL and the ending slash will be removed).
     * @return Simplified server location.
     */
    public static String simplifyServerLocation(String name, boolean forKey) {
        return HudsonManagerImpl.simplifyServerLocation(name, forKey);
    }

    public static void addHudsonChangeListener(HudsonChangeListener listener) {
        HudsonManagerImpl.getDefault().addHudsonChangeListener(listener);
    }

    public static void removeHudsonChangeListener(HudsonChangeListener listener) {
        HudsonManagerImpl.getDefault().removeHudsonChangeListener(listener);
    }
}

Lines 43-48 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/api/HudsonMavenModuleBuild.java (+29 lines)
43	package org.netbeans.modules.hudson.api;	43	package org.netbeans.modules.hudson.api;
44		44
45	import org.netbeans.modules.hudson.api.HudsonJob.Color;	45	import org.netbeans.modules.hudson.api.HudsonJob.Color;
		46	import org.netbeans.modules.hudson.spi.ConsoleDataDisplayerImpl;
		47	import org.netbeans.modules.hudson.spi.FailureDataDisplayerImpl;
46	import org.openide.filesystems.FileSystem;	48	import org.openide.filesystems.FileSystem;
47		49
48	/**	50	/**
Lines 86-89 Link Here
86	*/	88	*/
87	String getBuildDisplayName();	89	String getBuildDisplayName();
88		90
		91	/**
		92	* Check whether build console is supported by this module build.
		93	*
		94	* @return True if the build console can be shown, false otherwise.
		95	*/
		96	boolean canShowConsole();
		97
		98	/**
		99	* Show console data using a displayer.
		100	*
		101	* @param displayer Displayer capable to display the console data.
		102	*/
		103	void showConsole(ConsoleDataDisplayerImpl displayer);
		104
		105	/**
		106	* Check whether build failures are supported by this module build.
		107	*
		108	* @return True if build failures can be shown, false otherwise.
		109	*/
		110	boolean canShowFailures();
		111
		112	/**
		113	* Show build failures using a displayer.
		114	*
		115	* @param displayer Displayer capable to display the failure data.
		116	*/
		117	void showFailures(FailureDataDisplayerImpl displayer);
89	}	118	}

Lines 51-57 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/api/Utilities.java (-1 / +43 lines)
51	import javax.xml.xpath.XPath;	51	import javax.xml.xpath.XPath;
52	import javax.xml.xpath.XPathExpressionException;	52	import javax.xml.xpath.XPathExpressionException;
53	import javax.xml.xpath.XPathFactory;	53	import javax.xml.xpath.XPathFactory;
54	import org.netbeans.modules.hudson.api.HudsonVersion;	54	import org.netbeans.modules.hudson.Installer;
		55	import static org.netbeans.modules.hudson.api.HudsonJobBuild.Result.FAILURE;
		56	import static org.netbeans.modules.hudson.api.HudsonJobBuild.Result.SUCCESS;
		57	import static org.netbeans.modules.hudson.api.HudsonJobBuild.Result.UNSTABLE;
		58	import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
55	import org.openide.util.Parameters;	59	import org.openide.util.Parameters;
56	import org.w3c.dom.Element;	60	import org.w3c.dom.Element;
57		61
Lines 116-119 Link Here
116	}	120	}
117	private static final XPath xpath = XPathFactory.newInstance().newXPath();	121	private static final XPath xpath = XPathFactory.newInstance().newXPath();
118		122
		123	/**
		124	* Quickly check whether Hudson support is in use.
		125	*
		126	* @return True if Hudson support is in use, false otherwise.
		127	*/
		128	public static boolean isHudsonSupportActive() {
		129	return Installer.active();
		130	}
		131
		132	/**
		133	* Make an instance persistent.
		134	*
		135	* @param instance Hudson instance to persist.
		136	*/
		137	public static void persistInstance(HudsonInstance instance) {
		138	if (instance instanceof HudsonInstanceImpl) {
		139	((HudsonInstanceImpl) instance).makePersistent();
		140	}
		141	}
		142
		143	/**
		144	* Get appropriate {@link HudsonJob.Color} instance for a build.
		145	*
		146	* @param build Hudson Job Build.
		147	* @return Appropriate color, depending on the result of the build.
		148	*/
		149	public static HudsonJob.Color getColorForBuild(HudsonJobBuild build) {
		150	switch (build.getResult()) {
		151	case SUCCESS:
		152	return HudsonJob.Color.blue;
		153	case UNSTABLE:
		154	return HudsonJob.Color.yellow;
		155	case FAILURE:
		156	return HudsonJob.Color.red;
		157	default:
		158	return HudsonJob.Color.grey;
		159	}
		160	}
119	}	161	}




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

import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.spi.BuilderConnector.ConsoleDataProvider;
import org.netbeans.modules.hudson.spi.ConsoleDataDisplayerImpl;

/**
 * Displayer of console data. Insances of this class will be passed to
 * {@link ConsoleDataProvider#showConsole(HudsonJobBuild, ConsoleDataDisplayer)}
 * and
 * {@link ConsoleDataProvider#showConsole(HudsonMavenModuleBuild, ConsoleDataDisplayer)}.
 *
 * Do not implement this interface in your classes. Use
 * {@link ConsoleDataDisplayerImpl} instead.
 *
 * @author jhavlin
 */
public interface ConsoleDataDisplayer {

    /**
     * Prepare the console displayer for writing, initilize needed resources.
     */
    void open();

    /**
     * Write one line to the console.
     *
     * @param line Line of console output.
     * @return True if writing was successfull, false otherwise.
     */
    boolean writeLine(String line);

    /**
     * Finish writing to the console displayer, close all resources.
     */
    void close();
}




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

import java.util.ArrayList;
import java.util.List;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.spi.BuilderConnector.FailureDataProvider;
import org.netbeans.modules.hudson.spi.FailureDataDisplayerImpl;

/**
 * Displayer of failure data. Instances of this class will be passed to
 * {@link FailureDataProvider#showFailures(HudsonJobBuild, FailureDataDisplayer)}
 * and
 * {@link FailureDataProvider#showFailures(HudsonMavenModuleBuild, FailureDataDisplayer)}.
 *
 * Do not implement this interface in your classes. Use
 * {@link FailureDataDisplayerImpl} instead.
 *
 * @author jhavlin
 */
public interface FailureDataDisplayer {

    /**
     * Prepare the displayer for writing. Prepare needed resources.
     */
    void open();

    /**
     * Show a test suite.
     *
     * @param suite Test suite data.
     */
    void showSuite(Suite suite);

    /**
     * Finish writing to the displayer. Close all resources.
     */
    void close();

    /**
     * Info about failed test suite.
     */
    public static final class Suite {

        private String name;
        private String stdout;
        private String stderr;
        private long duration;
        private final List<Case> cases = new ArrayList<Case>();

        public String getName() {
            return name;
        }

        public String getStdout() {
            return stdout;
        }

        public String getStderr() {
            return stderr;
        }

        public long getDuration() {
            return duration;
        }

        public void setName(String name) {
            this.name = name;
        }

        public void setStdout(String stdout) {
            this.stdout = stdout;
        }

        public void setStderr(String stderr) {
            this.stderr = stderr;
        }

        public void setDuration(long duration) {
            this.duration = duration;
        }

        public List<Case> getCases() {
            return cases;
        }

        public void addCase(Case cs) {
            cases.add(cs);
        }
    }

    /**
     * Info about failed test case.
     */
    public static final class Case {

        private String className;
        private String name;
        private String errorStackTrace;
        private long duration;

        public String getClassName() {
            return className;
        }

        public String getName() {
            return name;
        }

        public String getErrorStackTrace() {
            return errorStackTrace;
        }

        public long getDuration() {
            return duration;
        }

        public void setClassName(String className) {
            this.className = className;
        }

        public void setName(String name) {
            this.name = name;
        }

        public void setErrorStackTrace(String errorStackTrace) {
            this.errorStackTrace = errorStackTrace;
        }

        public void setDuration(long duration) {
            this.duration = duration;
        }
    }
}

Lines 42-48 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/interfaces/OpenableInBrowser.java (-1 / +1 lines)
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44		44
45	package org.netbeans.modules.hudson.ui.interfaces;	45	package org.netbeans.modules.hudson.api.ui;
46		46
47	/**	47	/**
48	* Marks objects that can be open in browser	48	* Marks objects that can be open in browser




 */
public class HudsonConnector extends BuilderConnector {
    private static final Logger LOG = Logger.getLogger(HudsonConnector.class.getName());
    public static final HudsonFailureDataProvider HUDSON_FAILURE_DISPLAYER =
            new HudsonFailureDataProvider();
    public static final HudsonConsoleDataProvider HUDSON_CONSOLE_DISPLAYER =
            new HudsonConsoleDataProvider();
    
    private HudsonVersion version;
    private boolean connected = false;

    }

    @Override
    public ConsoleDataProvider getConsoleDataProvider() {
        return HUDSON_CONSOLE_DISPLAYER;
    }

    @Override
    public FailureDataProvider getFailureDataProvider() {
        return HUDSON_FAILURE_DISPLAYER;
    }





import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.GZIPInputStream;
import javax.swing.Action;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.api.ui.ConsoleDataDisplayer;
import org.netbeans.modules.hudson.spi.BuilderConnector;
import org.netbeans.modules.hudson.ui.actions.Hyperlinker;
import org.openide.util.RequestProcessor;
import org.openide.windows.IOProvider;
import org.openide.windows.InputOutput;
import org.openide.windows.OutputWriter;

/**
 *
 * @author jhavlin
 */
public class HudsonConsoleDataProvider extends BuilderConnector.ConsoleDataProvider {

    private static final Logger LOG = Logger.getLogger(
            HudsonConsoleDataProvider.class.getName());
    private boolean stopped = false;

    @Override
    public void showConsole(final HudsonJobBuild build,
            final ConsoleDataDisplayer displayer) {
        new RequestProcessor(build.getUrl() + "console").post( //NOI18N
                new Runnable() {
            @Override
            public void run() {
                showBuildConsole(build.getJob(), build.getUrl(),
                        build.getDisplayName(), displayer);
            }
        });
    }

    @Override
    public void showConsole(final HudsonMavenModuleBuild moduleBuild,
            final ConsoleDataDisplayer displayer) {
        new RequestProcessor(moduleBuild.getUrl() + "console").post( //NOI18N
                new Runnable() {
            @Override
            public void run() {
                showBuildConsole(moduleBuild.getBuild().getJob(),
                        moduleBuild.getUrl(), moduleBuild.getDisplayName(),
                        displayer);
            }
        });
    }

    @org.netbeans.api.annotations.common.SuppressWarnings(value = "OS_OPEN_STREAM")
    @java.lang.SuppressWarnings(value = "SleepWhileInLoop")
    public void showBuildConsole(HudsonJob job, String url, String displayName,
            ConsoleDataDisplayer displayer) {

        LOG.log(Level.FINE, "{0} started", url);                        //NOI18N
        displayer.open();
        io.select();
        /* If any metadata is needed, e.g. whether it is running, could use:
         HudsonJobBuild build = instance.getConnector().getJobBuild(job, buildNumber);
         if (build == null) {

         */
        int start = 0;
        String urlPrefix = url + "progressiveLog?start=";               //NOI18N
        OutputWriter out = io.getOut();
        OutputWriter err = io.getErr();
        boolean running = job.getLastBuild() > job.getLastCompletedBuild(); // XXX should also check that this is in fact the current build
        try {
            while (!stopped) {
                LOG.log(Level.FINE, "{0} polling", url);                //NOI18N
                if (out.checkError() || err.checkError() || io.isClosed()) {
                    LOG.log(Level.FINE, "{0} stopped", url);            //NOI18N
                    break;
                }
                URLConnection conn = new ConnectionBuilder().job(job).url(urlPrefix + start).header("Accept-Encoding", "gzip").connection(); //NOI18N
                boolean moreData = Boolean.parseBoolean(conn.getHeaderField("X-More-Data")); // NOI18N
                LOG.log(Level.FINE, "{0} retrieving text from {1}", new Object[]{url, start});

                    BufferedReader r = new BufferedReader(new InputStreamReader(isToUse, "UTF-8")); //NOI18N
                    String line;
                    while ((line = r.readLine()) != null) {
                        boolean success = displayer.writeLine(line);
                        if (!success) {
                            LOG.log(Level.FINE, "{0} stopped", url);    //NOI18N
                            stopped = true;
                            break;
                        }
                    }
                } finally {
                    is.close();

        } catch (IOException x) {
            LOG.log(Level.INFO, null, x);
        }
        displayer.close();
        err.close();
    }
}




package org.netbeans.modules.hudson.impl;

import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.AbstractAction;
import javax.swing.Action;
import org.netbeans.api.java.classpath.GlobalPathRegistry;
import org.netbeans.api.project.Project;
import org.netbeans.modules.gsf.testrunner.api.CallstackFrameNode;
import org.netbeans.modules.gsf.testrunner.api.DiffViewAction;
import org.netbeans.modules.gsf.testrunner.api.Manager;
import org.netbeans.modules.gsf.testrunner.api.TestMethodNode;
import org.netbeans.modules.gsf.testrunner.api.TestRunnerNodeFactory;
import org.netbeans.modules.gsf.testrunner.api.TestSession;
import org.netbeans.modules.gsf.testrunner.api.TestSuite;
import org.netbeans.modules.gsf.testrunner.api.Testcase;
import org.netbeans.modules.gsf.testrunner.api.TestsuiteNode;
import org.netbeans.modules.gsf.testrunner.api.Trouble;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.api.ui.FailureDataDisplayer;
import org.netbeans.modules.hudson.api.ui.FailureDataDisplayer.Case;
import org.netbeans.modules.hudson.api.ui.FailureDataDisplayer.Suite;
import org.netbeans.modules.hudson.spi.BuilderConnector;
import org.netbeans.modules.hudson.spi.HudsonLogger;
import org.netbeans.modules.hudson.ui.actions.Hyperlinker;
import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;
import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;
import org.openide.awt.StatusDisplayer;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.windows.IOProvider;
import org.openide.windows.InputOutput;
import org.openide.windows.OutputWriter;
import org.openide.xml.XMLUtil;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;

 *
 * @author jhavlin
 */
@NbBundle.Messages({
    "no_test_result=No test result found for this build."})
public class HudsonFailureDataProvider extends BuilderConnector.FailureDataProvider {

    private static final Logger LOG = Logger.getLogger(
            HudsonFailureDataProvider.class.getName());
    private static final RequestProcessor RP = new RequestProcessor(
            HudsonFailureDisplayer.class);
    private static final Pattern ASSERTION_FAILURE = Pattern.compile(
            "(?m)junit[.]framework[.](AssertionFailedError|(Array)?ComparisonFailure)|java[.]lang[.]AssertionError($|: )"); //NOI18N

    @Override
    public void showFailures(final HudsonJobBuild build,
            final FailureDataDisplayer displayer) {
        new RequestProcessor(build.getUrl() + "failures").post( // NOI18N
                new Runnable() {
            @Override
            public void run() {
                showBuildFailures(build.getJob(), build.getUrl(), displayer);
                        build.getDisplayName());
            }
        });
    }

    @Override
    public void showFailures(final HudsonMavenModuleBuild moduleBuild,
            final FailureDataDisplayer displayer) {
        new RequestProcessor(moduleBuild.getUrl() + "failures").post( // NOI18N
                new Runnable() {
            @Override
            public void run() {
                showBuildFailures(moduleBuild.getBuild().getJob(),
                        moduleBuild.getUrl(), displayer);
                        moduleBuild.getBuildDisplayName());
            }
        });
    }

    private void showBuildFailures(HudsonJob job, String url,
            FailureDataDisplayer displayer) {

        "LBL_GotoSource=Go to Source",
        "no_test_result=No test result found for this build.",
        "# {0} - Java source file resource path", "no_source_to_hyperlink=Could not find {0} among open projects."
    })
    public void showBuildFailures(HudsonJob job, String url, String displayName) {
        try {
            XMLReader parser = XMLUtil.createXMLReader();
            parser.setContentHandler(new ContentHandler(displayer));
            // XXX could use ?tree (would be faster) if there were an alternate object for failed tests only
            String u = url + "testReport/api/xml?xpath=//suite[case/errorStackTrace]&wrapper=failures"; //NOI18N
            InputSource source = new InputSource(new ConnectionBuilder().job(job).url(u).connection().getInputStream());
            source.setSystemId(u);
            displayer.open();
            parser.parse(source);
        } catch (FileNotFoundException x) {
            Toolkit.getDefaultToolkit().beep();


    private class ContentHandler extends DefaultHandler {

        private StringBuilder buf;
        private final FailureDataDisplayer displayer;
            this.displayName = displayName;
            this.hyperlinker = new Hyperlinker(job);
            this.session = createTestSession(displayName);
        }
        private String url;
        private String displayName;
        InputOutput io;
        StringBuilder buf;
        Hyperlinker hyperlinker;
        TestSession session;
        Project project;

        public ContentHandler(FailureDataDisplayer displayer) {
            this.displayer = displayer;
            // Store reference to project here, as reference in test session
            // is weak.
            this.project = new Project() {
                public @Override
                FileObject getProjectDirectory() {
                    return FileUtil.createMemoryFileSystem().getRoot();
                }

                public @Override
                Lookup getLookup() {
                    return Lookup.EMPTY;
                }
            };
            TestRunnerNodeFactory testRunnerNodeFactory =
                    new HudsonTestRunnerNodeFactory();
            return new TestSession(displayName, project,
                    TestSession.SessionType.TEST, testRunnerNodeFactory);
        }

        private void prepareOutput() {
            if (io == null) {
                String title = Bundle.ShowFailures_title(displayName);
                io = IOProvider.getDefault().getIO(title, new Action[0]);
                io.select();
                Manager.getInstance().testStarted(session);
            }
        }

        class Suite {

            String name;
            String stdout;
            String stderr;
            Stack<Case> cases = new Stack<Case>();
            List<Case> casesDone = new ArrayList<Case>();
            long duration;
        }

        class Case {

            String className;
            String name;
            String errorStackTrace;
            long duration;
        }

        long parseDuration(String d) {

                return 0;
            }
        }

        Suite suite = null;
        Case caze = null;

        public @Override
        void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
            if (qName.matches("errorStackTrace|stdout|stderr|name|className")) { //NOI18N
                buf = new StringBuilder();
            } else if (qName.equals("suite")) { //NOI18N
                suite = new Suite();
                caze = null;
            } else if (qName.equals("case") && suite != null) { //NOI18N
                caze = new Case();
            }
        }



        public @Override
        void endElement(String uri, String localName, String qName) throws SAXException {
            if (suite == null) {
                return;
            }
            Suite s = suites.peek();
            String text = buf != null && buf.length() > 0 ? buf.toString() : null;
            buf = null;
            if (caze == null) { // suite level
                if (qName.equals("stdout")) { // NOI18N
                    suite.setStdout(text);
                } else if (qName.equals("stderr")) { // NOI18N
                    suite.setStderr(text);
                } else if (qName.equals("name")) { // NOI18N
                    suite.setName(text);
                } else if (qName.equals("duration")) { // NOI18N
                    suite.setDuration(parseDuration(text));
                }
            } else { // case level
                Case c = s.cases.peek();
                if (qName.equals("errorStackTrace")) { // NOI18N
                    caze.setErrorStackTrace(text);
                } else if (qName.equals("name")) { // NOI18N
                    caze.setName(text);
                } else if (qName.equals("className")) { // NOI18N
                    caze.setClassName(text);
                } else if (qName.equals("duration")) { // NOI18N
                    caze.setDuration(parseDuration(text));
                }
            }
            if (qName.equals("case")) { //NOI18N
                suite.addCase(caze);
                caze = null;
            } else if (qName.equals("suite")) { // NOI18N
                try {
                    displayer.showSuite(suite);
                } catch (Exception x) {
                    LOG.log(Level.FINE, null, x);
                }
                suite = null;
            } else if (qName.equals("case")) { // NOI18N
                s.casesDone.add(s.cases.pop());
            }
        }

        void show(Suite s) throws IOException {
            prepareOutput();
            OutputWriter out = io.getOut();
            OutputWriter err = io.getErr();
            TestSuite suite = new TestSuite(s.name);
            session.addSuite(suite);
            Manager.getInstance().displaySuiteRunning(session, suite.getName());
            if (s.stderr != null) {
                // XXX TR window does not seem to show only stdio from selected suite
                Manager.getInstance().displayOutput(session, s.stderr, true);
            }
            if (s.stdout != null) {
                Manager.getInstance().displayOutput(session, s.stdout, false);
            }
            for (final Case c : s.casesDone) {
                if (c.errorStackTrace == null) {
                    continue;
                }
                String name = c.className + "." + c.name; //NOI18N
                String shortName = c.name;
                if (s.name != null && !s.name.equals(c.className)) {
                    shortName = name;
                    name = Bundle.ShowFailures_from_suite(name, s.name);
                }
                println();
                out.println("[" + name + "]"); // XXX use color printing to make it stand out? //NOI18N
                show(c.errorStackTrace, /* err is too hard to read */ out);
                Testcase test = new Testcase(shortName, null, session);
                test.setClassName(c.className);
                Trouble trouble = new Trouble(!ASSERTION_FAILURE.matcher(c.errorStackTrace).lookingAt());
                trouble.setStackTrace(c.errorStackTrace.split("\r?\n")); //NOI18N
                // XXX call setComparisonFailure if matches "expected:<...> but was:<...>"
                test.setTrouble(trouble);
                LOG.log(Level.FINE, "got {0} as {1}", new Object[]{name, test.getStatus()}); //NOI18N
                test.setTimeMillis(c.duration);
                session.addTestCase(test);
            }
            if (s.stderr != null || s.stdout != null) {
                println();
                show(s.stderr, err);
                show(s.stdout, out);
            }
            Manager.getInstance().displayReport(session, session.getReport(s.duration));
        }
        boolean firstLine = true;

        void println() {
            if (firstLine) {
                firstLine = false;
            } else {
                io.getOut().println();
            }
        }

        void show(String lines, OutputWriter w) {
            if (lines == null) {
                return;
            }
            for (String line : lines.split("\r\n?|\n")) { //NOI18N
                hyperlinker.handleLine(line, w);
            }
        }

        @Override
        public void endDocument() throws SAXException {
            displayer.close();
                io.getOut().close();
                io.getErr().close();
                Manager.getInstance().sessionFinished(session);
            }
        }

        private class HudsonTestRunnerNodeFactory extends TestRunnerNodeFactory {

            public HudsonTestRunnerNodeFactory() {
            }

            public @Override
            TestsuiteNode createTestSuiteNode(String suiteName, boolean filtered) {
                // XXX could add OpenableInBrowser
                return new TestsuiteNode(suiteName, filtered);
            }

            public @Override
            org.openide.nodes.Node createTestMethodNode(final Testcase testcase,
                    Project project) {
                return new TestMethodNode(testcase, project) {
                    public @Override
                    Action[] getActions(boolean context) {
                        return new Action[]{
                                    OpenUrlAction.forOpenable(new OpenableInBrowser() {
                                public @Override
                                String getUrl() {
                                    return url + "testReport/"
                                            + testcase.getClassName().replaceFirst("[.][^.]+$", "") + "/" + testcase.getClassName().replaceFirst(".+[.]", "") + "/" + testcase.getName() + "/"; //NOI18N
                                }
                            }),
                                    new DiffViewAction(testcase),};
                    }
                };
            }

            public @Override
            org.openide.nodes.Node createCallstackFrameNode(String frameInfo, String displayName) {
                return new CallstackFrameNode(frameInfo, displayName) {
                    public @Override
                    Action getPreferredAction() {
                        return new AbstractAction(Bundle.LBL_GotoSource()) {
                            public @Override
                            void actionPerformed(ActionEvent e) {
                                // XXX should have utility API to parse stack traces
                                final Matcher m = Pattern.compile("\tat (.+[.])[^.]+[.][^.]+[(]([^.]+[.]java):([0-9]+)[)]").matcher(frameInfo); //NOI18N
                                if (m.matches()) {
                                    final String resource = m.group(1).replace('.', '/') + m.group(2);
                                    RP.post(new Runnable() {
                                        @Override
                                        public void run() {
                                            FileObject f = GlobalPathRegistry.getDefault().findResource(resource);
                                            LOG.log(Level.FINER, "matched {0} -> {1}", new Object[]{resource, f}); //NOI18N
                                            if (f != null) {
                                                HudsonLogger.Helper.openAt(f, Integer.parseInt(m.group(3)) - 1, -1, true);
                                            } else {
                                                StatusDisplayer.getDefault().setStatusText(Bundle.no_source_to_hyperlink(resource));
                                            }
                                        }
                                    });
                                } else {
                                    LOG.log(Level.FINER, "no match for {0}", frameInfo); //NOI18N
                                }
                            }
                        };
                    }

                    public @Override
                    Action[] getActions(boolean context) {
                        return new Action[]{getPreferredAction()};
                    }
                };
            }
        }
    }
}

Lines 48-55 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/impl/HudsonFolderImpl.java (-1 / +1 lines)
48	import org.netbeans.modules.hudson.api.HudsonFolder;	48	import org.netbeans.modules.hudson.api.HudsonFolder;
49	import org.netbeans.modules.hudson.api.HudsonInstance;	49	import org.netbeans.modules.hudson.api.HudsonInstance;
50	import org.netbeans.modules.hudson.api.HudsonJob;	50	import org.netbeans.modules.hudson.api.HudsonJob;
		51	import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
51	import org.netbeans.modules.hudson.spi.BuilderConnector;	52	import org.netbeans.modules.hudson.spi.BuilderConnector;
52	import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;
53	import org.openide.util.ChangeSupport;	53	import org.openide.util.ChangeSupport;
54	import org.openide.util.WeakListeners;	54	import org.openide.util.WeakListeners;
55		55




import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonChangeAdapter;
import org.netbeans.modules.hudson.api.HudsonChangeListener;
import org.netbeans.modules.hudson.api.HudsonFolder;
import org.netbeans.modules.hudson.api.HudsonInstance;

import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.api.HudsonVersion;
import org.netbeans.modules.hudson.api.HudsonView;
import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
import org.netbeans.modules.hudson.constants.HudsonInstanceConstants;
import static org.netbeans.modules.hudson.constants.HudsonInstanceConstants.*;
import static org.netbeans.modules.hudson.constants.HudsonJobConstants.*;
import org.netbeans.modules.hudson.spi.BuilderConnector;
import org.netbeans.modules.hudson.spi.RemoteFileSystem;
import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;
import org.netbeans.modules.hudson.ui.notification.ProblemNotificationController;
import org.openide.filesystems.FileSystem;
import org.openide.filesystems.FileUtil;
import org.openide.util.Cancellable;

    private Collection<HudsonView> views = new ArrayList<HudsonView>();
    private HudsonView primaryView;
    private final Collection<HudsonChangeListener> listeners = new ArrayList<HudsonChangeListener>();
    private ProblemNotificationController problemNotificationController;
    /**
     * Must be kept here, not in {@link HudsonJobImpl}, because that is transient
     * and this should persist across refreshes.

                }
            }
        });
        
        addHudsonChangeListener(new HudsonChangeAdapter() {
            @Override
            public void contentChanged() {
                if (problemNotificationController == null) {
                    problemNotificationController = new ProblemNotificationController(HudsonInstanceImpl.this);
                }
                problemNotificationController.updateNotifications();
            }
        });
    }

    @Override public boolean isPersisted() {

        // Fire changes
        fireStateChanges();
        fireContentChanges();
        if (problemNotificationController != null) {
            problemNotificationController.clearNotifications();
        }
    }
    
    public BuilderConnector getBuilderConnector() {

     * Will run asynchronously.
     * @param authentication to prompt for login if the anonymous user cannot even see the job list; set to true for explicit user gesture, false otherwise
     */
    @Override
    public void synchronize(final boolean authentication) {
        if (terminated) {
            return;

    public Persistence getPersistence() {
        return persistence;
    }

    @Override
    public List<String> getPreferredJobs() {
        String preferred = properties.get(INSTANCE_PREF_JOBS);
        if (preferred == null) {
            return null;
        } else {
            return HudsonInstanceProperties.split(preferred);
        }
    }

    @Override
    public void setPreferredJobs(List<String> preferredJobs) {
        if (preferredJobs == null) {
            properties.put(INSTANCE_PREF_JOBS, null);
        } else {
            properties.put(INSTANCE_PREF_JOBS,
                    HudsonInstanceProperties.join(preferredJobs));
        }
    }

    @Override
    public int getSyncInterval() {
        return Integer.parseInt(getProperties().get(
                HudsonInstanceConstants.INSTANCE_SYNC));
    }

    @Override
    public void setSyncInterval(int syncInterval) {
        getProperties().put(HudsonInstanceConstants.INSTANCE_SYNC,
                Integer.toString(syncInterval));
    }

    @Override
    public void addPropertyChangeListener(PropertyChangeListener listener) {
        getProperties().addPropertyChangeListener(listener);
    }

    @Override
    public void removePropertyChangeListener(PropertyChangeListener listener) {
        getProperties().removePropertyChangeListener(listener);
    }
}




import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import static org.netbeans.modules.hudson.constants.HudsonInstanceConstants.*;
import static org.netbeans.modules.hudson.impl.Bundle.*;
import org.openide.nodes.Node;
import org.openide.nodes.PropertySupport;
import org.openide.nodes.Sheet;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle.Messages;
import org.openide.util.RequestProcessor;

/**

 */
public class HudsonInstanceProperties extends HashMap<String,String> {
    
    private Sheet.Set set;
    private static final RequestProcessor RP = new RequestProcessor(
            HudsonInstanceProperties.class);
    

        return pers == null || TRUE.equals(pers);
    }

    @Messages({
        "TXT_Instance_Prop_Name=Name",
        "DESC_Instance_Prop_Name=Hudson's instance name",
        "TXT_Instance_Prop_Url=URL",
        "DESC_Instance_Prop_Url=Hudson's instance URL",
        "TXT_Instance_Prop_Sync=Autosynchronization time",
        "DESC_Instance_Prop_Sync=Autosynchronization time in minutes (if it's 0 the autosynchronization is off)"
    })
    public Sheet.Set getSheetSet() {
        if (null == set) {
            set = Sheet.createPropertiesSet();
            
            // Set display name
            set.setDisplayName(get(INSTANCE_NAME));
            
            // Put properties in
            set.put(new Node.Property<?>[] {
                new HudsonInstanceProperty(INSTANCE_NAME,
                        TXT_Instance_Prop_Name(),
                        DESC_Instance_Prop_Name(),
                        true, false),
                        new HudsonInstanceProperty(INSTANCE_URL,
                        TXT_Instance_Prop_Url(),
                        DESC_Instance_Prop_Url(),
                        true, false),
                        new PropertySupport<Integer>(INSTANCE_SYNC, Integer.class,
                        TXT_Instance_Prop_Sync(),
                        DESC_Instance_Prop_Sync(),
                        true, true) {
                            @Override public Integer getValue() {
                                return Integer.valueOf(get(INSTANCE_SYNC));
                            }
                            @Override public void setValue(Integer val) {
                                if (val == null || val < 0) {
                                    throw new IllegalArgumentException();
                                }
                                put(INSTANCE_SYNC, val.toString());
                            }
                            public @Override boolean canWrite() {
                                return isPersisted();
                            }
                        }
            });
        }
        
        return set;
    }
    
    public void addPropertyChangeListener(PropertyChangeListener l) {
        pcs.addPropertyChangeListener(l);
    }

        return Arrays.asList(pcs.getPropertyChangeListeners());
    }

    private class HudsonInstanceProperty extends PropertySupport<String> {
        
        private String key;
        
        HudsonInstanceProperty(String key, String name, String desc, boolean read, boolean write) {
            super(key, String.class, name, desc, read, write);
            
            this.key = key;
        }
        
        @Override
        public void setValue(String value) {
            put(key, value);
        }
        
        @Override
        public String getValue() {
            return get(key);
        }
    }

    public static List<String> split(String prop) {
        if (prop != null && prop.trim().length() > 0) {
            String[] escaped = prop.split("(?<!/)/(?!/)");              //NOI18N





package org.netbeans.modules.hudson.impl;

import java.io.IOException;
import java.util.ArrayList;
import org.netbeans.modules.hudson.api.HudsonJob.Color;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.impl.HudsonJobImpl.HudsonMavenModule;
import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJob.Color;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.api.ui.ConsoleDataDisplayer;
import org.netbeans.modules.hudson.api.ui.FailureDataDisplayer;
import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
import static org.netbeans.modules.hudson.impl.Bundle.*;
import org.netbeans.modules.hudson.impl.HudsonJobImpl.HudsonMavenModule;
import org.netbeans.modules.hudson.spi.BuilderConnector;
import org.netbeans.modules.hudson.spi.ConsoleDataDisplayerImpl;
import org.netbeans.modules.hudson.spi.FailureDataDisplayerImpl;
import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;
import org.openide.filesystems.FileSystem;
import org.openide.util.Lookup;
import org.openide.util.NbBundle.Messages;
import static org.netbeans.modules.hudson.impl.Bundle.*;
import org.netbeans.modules.hudson.spi.BuilderConnector;
import org.openide.windows.OutputListener;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

public class HudsonJobBuildImpl implements HudsonJobBuild, OpenableInBrowser {


        return HudsonJobBuildImpl_display_name(job.getDisplayName(), getNumber());
    }

    private ConsoleDataDisplayer createDisplayerFromImpl(
            final ConsoleDataDisplayerImpl displayerImpl) {
        return new ConsoleDataDisplayer() {

            @Override
            public void open() {
                displayerImpl.open();
            }

            @Override
            public boolean writeLine(String line) {
                return displayerImpl.writeLine(line);
            }

            @Override
            public void close() {
                displayerImpl.close();
            }
        };
    }

    private FailureDataDisplayer createDisplayerFromImpl(
            final FailureDataDisplayerImpl displayerImpl) {
        return new FailureDataDisplayer() {

            @Override
            public void open() {
                displayerImpl.open();
            }

            @Override
            public void showSuite(FailureDataDisplayer.Suite suite) {
                displayerImpl.showSuite(suite);
            }

            @Override
            public void close() {
                displayerImpl.close();
            }
        };
    }

    @Override
    public boolean canShowConsole() {
        return connector.getConsoleDataProvider() != null;
    }

    @Override
    public void showConsole(ConsoleDataDisplayerImpl displayer) {
        BuilderConnector.ConsoleDataProvider cd = connector.getConsoleDataProvider();
        if (cd != null) {
            cd.showConsole(this, createDisplayerFromImpl(displayer));
        }
    }

    @Override
    public boolean canShowFailures() {
        return connector.getFailureDataProvider() != null;
    }

    @Override
    public void showFailures(FailureDataDisplayerImpl displayer) {
        BuilderConnector.FailureDataProvider fd = connector.getFailureDataProvider();
        if (fd != null) {
            fd.showFailures(this, createDisplayerFromImpl(displayer));
        }
    }


            return HudsonJobBuildImpl_display_name(getDisplayName(), getNumber());
        }

        @Override
        public boolean canShowConsole() {
            return getBuild().canShowConsole();
        }

        @Override
        public void showConsole(ConsoleDataDisplayerImpl displayer) {
            BuilderConnector.ConsoleDataProvider cd = connector.getConsoleDataProvider();
            if (cd != null) {
                cd.showConsole(this, createDisplayerFromImpl(displayer));
            }
        }

        @Override
        public boolean canShowFailures() {
            return getBuild().canShowFailures();
        }

        @Override
        public void showFailures(FailureDataDisplayerImpl displayer) {
            BuilderConnector.FailureDataProvider fp = connector.getFailureDataProvider();
            if (fp != null) {
                fp.showFailures(this, createDisplayerFromImpl(displayer));
            }
        }
    }

}




import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.api.HudsonView;
import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
import static org.netbeans.modules.hudson.constants.HudsonJobConstants.*;
import static org.netbeans.modules.hudson.impl.Bundle.*;
import org.netbeans.modules.hudson.spi.BuilderConnector;
import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;
import org.netbeans.modules.hudson.util.HudsonPropertiesSupport;
import org.openide.filesystems.FileSystem;
import org.openide.nodes.Node;
import org.openide.nodes.PropertySupport;
import org.openide.nodes.Sheet;
import org.openide.util.NbBundle.Messages;
import org.openide.util.Utilities;


    
    private HudsonInstanceImpl instance;
    
    private Sheet.Set set;

    HudsonJobImpl(HudsonInstanceImpl instance) {
        this.instance = instance;
    }

        instance.synchronize(false);
    }

    @Messages({
        "TXT_Job_Prop_Name=Name",
        "DESC_Job_Prop_Name=Hudson's job name",
        "TXT_Job_Prop_Url=URL",
        "DESC_Job_Prop_Url=Hudson's job URL",
        "HudsonJobImpl.watched=Watched",
        "HudsonJobImpl.watched_desc=Whether you wish to be notified of failures in this job."
    })
    public Sheet.Set getSheetSet() {
        if (null == set) {
            set = Sheet.createPropertiesSet();
            
            // Set display name
            set.setDisplayName(getDisplayName());
            
            // Put properties in
            set.put(new Node.Property<?>[] {
                new HudsonJobProperty(JOB_NAME,
                        TXT_Job_Prop_Name(),
                        DESC_Job_Prop_Name()),
                new HudsonJobProperty(JOB_URL,
                        TXT_Job_Prop_Url(),
                        DESC_Job_Prop_Url()),
                new PropertySupport.ReadWrite<Boolean>("salient", Boolean.TYPE, // NOI18N
                        HudsonJobImpl_watched(),
                        HudsonJobImpl_watched_desc()) {
                    @Override public Boolean getValue() {
                        return isSalient();
                    }
                    @Override public void setValue(Boolean val) {
                        if (!getValue().equals(val)) {
                            setSalient(val);
                        }
                    }
                }
            });
        }
        
        return set;
    }

    @Override public FileSystem getRemoteWorkspace() {
        return instance.getRemoteWorkspace(this);
    }

            return url;
        }
    }

    private class HudsonJobProperty extends PropertySupport.ReadOnly<String> {
        HudsonJobProperty(String key, String name, String desc) {
            super(key, String.class, name, desc);
        }
        public @Override String getValue() {
            return properties.getProperty(super.getName(), String.class);
        }
    }
}





package org.netbeans.modules.hudson.impl;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.modules.hudson.api.HudsonChangeListener;
import org.netbeans.modules.hudson.api.HudsonInstance;
import static org.netbeans.modules.hudson.constants.HudsonInstanceConstants.*;
import org.netbeans.modules.hudson.spi.HudsonManagerAgent;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.NbPreferences;
import org.openide.util.RequestProcessor;


    
    private Map<String, HudsonInstanceImpl> instances;
    private final List<HudsonChangeListener> listeners = new ArrayList<HudsonChangeListener>();
    private final Collection<? extends HudsonManagerAgent> agents;
    private Map<Project, HudsonInstanceImpl> projectInstances = new HashMap<Project, HudsonInstanceImpl>();
    private final RequestProcessor.Task checkOpenProjects = RP.create(new Runnable() {
        public @Override void run() {
            checkOpenProjects();
        }
    });
    
    private HudsonManagerImpl() {
        this.agents = Lookup.getDefault().lookupAll(HudsonManagerAgent.class);
            public void propertyChange(PropertyChangeEvent evt) {
                if (OpenProjects.PROPERTY_OPEN_PROJECTS.equals(evt.getPropertyName())) {
                    checkOpenProjects.schedule(0);
                }
            }
        };
    }
    
    /**

        
        if (null != getInstancesMap().put(instance.getUrl(), instance))
            return null;
        for (HudsonManagerAgent agent: agents) {
            agent.instanceAdded(instance);
        }
        fireChangeListeners();
        return instance;
    }

        // Stop autosynchronization if it's running
        instance.terminate();
        
        for (HudsonManagerAgent agent : agents) {
            agent.instanceRemoved(instance);
        }
        // Fire changes into all listeners
        fireChangeListeners();
        

    public void terminate() {
        // Clear default instance
        defaultInstance = null;
        for (HudsonManagerAgent agent: agents) {
            agent.terminate();
        }
        // Terminate instances
        for (HudsonInstance instance : getInstances())
            ((HudsonInstanceImpl) instance).terminate();


    private void init() {
        RP.post(new Runnable() {
            @Override
            public void run() {
                try {
                    try {

                        Exceptions.printStackTrace(ex);
                    }
                } finally {
                    checkOpenProjects();
                    OpenProjects.getDefault().addPropertyChangeListener(projectsListener);
                    // Fire changes
                    fireChangeListeners();
                }
            }
        });
        for (HudsonManagerAgent agent: agents) {
            agent.start();

    private void checkOpenProjects() {
        try {
            Future<Project[]> fut = OpenProjects.getDefault().openProjects();
            Project[] prjs = fut.get();
            for (Project project : prjs) {
                boolean exists = false;
                if (projectInstances.containsKey(project)) {
                    exists = true;
                }
                ProjectHudsonProvider.Association assoc = ProjectHudsonProvider.getDefault().findAssociation(project);
                if (assoc != null && !exists) {
                    String url = assoc.getServerUrl();
                    HudsonInstanceImpl in = getInstance(url);
                    if (in != null && in.getProperties() instanceof ProjectHIP) {
                        ProjectHIP props = (ProjectHIP) in.getProperties();
                        props.addProvider(project);
                        projectInstances.put(project,in);
                    } else if (in == null) {
                        ProjectHIP props = new ProjectHIP();
                        props.addProvider(project);
                        addInstance(HudsonInstanceImpl.createHudsonInstance(props, false));
                        HudsonInstanceImpl impl = getInstance(props.get(INSTANCE_URL));
                        projectInstances.put(project, impl);
                    }
                } else if (assoc == null && exists) {
                    HudsonInstanceImpl remove = projectInstances.remove(project);
                    if (remove != null && remove.getProperties() instanceof ProjectHIP) {
                        ProjectHIP props = (ProjectHIP)remove.getProperties();
                        props.removeProvider(project);
                        if (props.getProviders().isEmpty()) {
                            removeInstance(remove);
                        }
                    }
                }
            }
            ArrayList<Project> newprjs = new ArrayList<Project>(projectInstances.keySet());
            newprjs.removeAll(Arrays.asList(prjs));
            for (Project project : newprjs) {
                HudsonInstanceImpl remove = projectInstances.remove(project);
                if (remove != null && remove.getProperties() instanceof ProjectHIP
                        && !remove.isPersisted()) {
                    ProjectHIP props = (ProjectHIP)remove.getProperties();
                    props.removeProvider(project);
                    if (props.getProviders().isEmpty()) {
                        removeInstance(remove);
                    }
                }
            }
        } catch (InterruptedException ex) {
            Exceptions.printStackTrace(ex);
        } catch (ExecutionException ex) {
            Exceptions.printStackTrace(ex);
        }
    }

}

Lines 46-52 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/impl/HudsonViewImpl.java (-1 / +1 lines)
46		46
47	import org.netbeans.modules.hudson.api.HudsonInstance;	47	import org.netbeans.modules.hudson.api.HudsonInstance;
48	import org.netbeans.modules.hudson.api.HudsonView;	48	import org.netbeans.modules.hudson.api.HudsonView;
49	import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;	49	import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
50	import static org.netbeans.modules.hudson.constants.HudsonViewConstants.*;	50	import static org.netbeans.modules.hudson.constants.HudsonViewConstants.*;
51	import org.netbeans.modules.hudson.util.HudsonPropertiesSupport;	51	import org.netbeans.modules.hudson.util.HudsonPropertiesSupport;
52		52




/*
 * 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-2007 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.hudson.impl;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.netbeans.api.project.Project;
import static org.netbeans.modules.hudson.constants.HudsonInstanceConstants.*;
import org.netbeans.modules.hudson.spi.ProjectHudsonProvider;

/**
 *
 * @author mkleint
 */
class ProjectHIP extends HudsonInstanceProperties {

    private final Set<Project> providers = new HashSet<Project>();
    public ProjectHIP() {
        super("", "", "60"); // NOI18N
        put(INSTANCE_PERSISTED, FALSE);
    }

    public void addProvider(Project prov) {
        synchronized (providers) {
            providers.add(prov);
        }
        ProjectHudsonProvider.Association assoc = ProjectHudsonProvider.getDefault().findAssociation(prov);
        if (assoc != null) {
            String u = assoc.getServerUrl();
            put(INSTANCE_URL, u);
            put(INSTANCE_NAME, HudsonManagerImpl.simplifyServerLocation(u, false));
            setPreferredJobs();
        }
        //TODO listen on changes from the provider and refire them as changed properties.
    }

    public void removeProvider(Project prov) {
        synchronized (providers) {
            providers.remove(prov);
        }
        setPreferredJobs();
    }

    public Set<Project> getProviders() {
        synchronized (providers) {
            return new HashSet<Project>(providers);
        }
    }

    private void setPreferredJobs() {
        List<String> names = new ArrayList<String>();
        for (Project prj : getProviders()) {
            ProjectHudsonProvider.Association assoc = ProjectHudsonProvider.getDefault().findAssociation(prj);
            if (assoc != null) {
                String name = assoc.getJobName();
                if (name != null) {
                    names.add(name);
                }
            }
        }
        put(INSTANCE_PREF_JOBS, join(names));
    }

}




import org.netbeans.modules.hudson.api.HudsonJobBuild.Result;
import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
import org.netbeans.modules.hudson.api.HudsonVersion;
import org.netbeans.modules.hudson.api.ui.ConsoleDataDisplayer;
import org.netbeans.modules.hudson.api.ui.FailureDataDisplayer;

/**
 * Interface of Hudson connectors. It specifies how data should be accessed and

    public abstract void startJob(@NonNull HudsonJob job);

    /**
     * Get provider of data for build console output.
     *
     * @return Console data provider, or null if it is not available for this
     * builder.
     */
    public abstract @CheckForNull ConsoleDataProvider getConsoleDataProvider();

    /**
     * Get provider of data for failure displayer.
     *
     * @return Failure data provider, or null if it is not available for this
     * builder.
     */
    public abstract @CheckForNull FailureDataProvider getFailureDataProvider();

    /**
     * Get a collection of changes that have triggered the build.

    public abstract Collection<? extends HudsonJobChangeItem> getJobBuildChanges(HudsonJobBuild build);

    /**
     * A provider of console output of builds. They can
     * be shown in output window, external browser, etc.
     */
    public static abstract class ConsoleDataProvider {

        /**
         * Show build console of a hudson job build using a displayer.
         *
         * @param build Hudson job build.
         * @param displayer Displayer to which the data will be passed.
         */
        public abstract void showConsole(@NonNull HudsonJobBuild build, ConsoleDataDisplayer displayer);

        /**
         * Show build console of a hudson maven module build.
         *
         * @param modBuild Hudson Maven module build.
         * @param displayer Displayer to which the data will be passed.
         */
        public abstract void showConsole(
                @NonNull HudsonMavenModuleBuild modBuild, ConsoleDataDisplayer displayer);
    }

    /**
     * A provider of info about test failures. They can be displayer
     * in test results window, output window, external browser, etc.
     */
    public static abstract class FailureDataProvider {

        /**
         * Show failures of a hudson job build.
         * @param build Hudson job build.
         * @param displayer Displayer to which the data will be passed.
         */
        public abstract void showFailures(@NonNull HudsonJobBuild build,
                @NonNull FailureDataDisplayer displayer);

        /**
         * Show failures of a hudson maven module build.
         *
         * @param moduleBuild Hudson maven module build.
         * @param displayer Displayer to which the data will be passed.
         */
        public abstract void showFailures(
                @NonNull HudsonMavenModuleBuild moduleBuild,
                @NonNull FailureDataDisplayer displayer);
    }

    /**




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

/**
 * Displays data from {@link BuilderConnector.ConsoleDataProvider}.
 *
 * @author jhavlin
 */
public abstract class ConsoleDataDisplayerImpl {

    /**
     * Prepare the displayer for writing.
     */
    public abstract void open();

    /**
     * Write one line of line to the displayer.
     *
     * @param line One line of console output.
     * @return True if writing was successful, false otherwise.
     */
    public abstract boolean writeLine(String line);

    /**
     * Finish writing to the displayer.
     */
    public abstract void close();
}




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

import org.netbeans.modules.hudson.api.ui.FailureDataDisplayer.Suite;

/**
 * Displays data from {@link BuilderConnector.FailureDataProvider}.
 *
 * @author jhavlin
 */
public abstract class FailureDataDisplayerImpl {

    /**
     * Prepare the displayer.
     */
    public abstract void open();

    /**
     * Display result of a test suite.
     *
     * @param suite Test suite data.
     */
    public abstract void showSuite(Suite suite);

    /**
     * Finish writing to the displayer.
     */
    public abstract void close();
}





package org.netbeans.modules.hudson.spi;

import java.awt.EventQueue;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.openide.cookies.EditorCookie;
import org.openide.cookies.LineCookie;
import org.openide.cookies.OpenCookie;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.text.Line;
import org.openide.windows.OutputWriter;

/**

         * @return true if this logger handled the output, false otherwise
         */
        boolean handle(String line, OutputWriter stream);

    }

    /**
     * Utilities for use by a logger.
     */
    class Helper {

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

        /**
         * Try to open a file, possibly at a given position.
         * @param f a file to open
         * @param row the row number (zero-based), or -1 for none
         * @param col the column number (zero-based), or -1 for none
         * @param force true to forcibly open the file, false to just scroll if already open
         */
        public static void openAt(FileObject f, int row, final int col, final boolean force) {
            try {
                DataObject d = DataObject.find(f);
                if (row == -1) {
                    if (force) {
                        Runnable r;
                        final EditorCookie c = d.getLookup().lookup(EditorCookie.class);
                        if (c != null) {
                            r = new Runnable() {
                                public void run() {
                                    try {
                                        c.openDocument();
                                    } catch (IOException x) {
                                        LOG.log(Level.INFO, null, x);
                                    }
                                }
                            };
                        } else {
                            LOG.fine("no EditorCookie found for " + f);
                            final OpenCookie o = d.getLookup().lookup(OpenCookie.class);
                            if (o == null) {
                                LOG.fine("no OpenCookie found for " + f);
                                return;
                            }
                            r = new Runnable() {
                                public void run() {
                                    o.open();
                                }
                            };
                        }
                        EventQueue.invokeLater(r);
                    }
                    return;
                }
                LineCookie c = d.getLookup().lookup(LineCookie.class);
                if (c == null) {
                    LOG.fine("no LineCookie found for " + f);
                    openAt(f, -1, -1, force);
                    return;
                }
                try {
                    final Line l = c.getLineSet().getOriginal(row);
                    EventQueue.invokeLater(new Runnable() {
                        public void run() {
                            l.show(force ? Line.ShowOpenType.REUSE : Line.ShowOpenType.NONE,
                                    force ? Line.ShowVisibilityType.FOCUS : Line.ShowVisibilityType.FRONT, col);
                        }
                    });
                } catch (IndexOutOfBoundsException x) {
                    LOG.log(Level.INFO, null, x);
                }
            } catch (IOException x) {
                LOG.log(Level.INFO, null, x);
            }
        }

    }

}




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

import org.netbeans.modules.hudson.api.HudsonInstance;

/**
 * Agent that is informed about addition and removal of Hudson instances, and
 * that helps the HudsonManager automatically add and remove Hudson instances,
 * depending on the state of the rest of the IDE. For example, some projects can
 * have associated Hudson builder. When such project is opened, its Hudson
 * instance should be added to the manager.
 *
 * @author jhavlin
 */
public abstract class HudsonManagerAgent {

    /**
     * Called when an instance is added to the manager (including the ones added
     * by the manager agent, too).
     *
     * @param instance Hudson instanca that has been just added.
     */
    public abstract void instanceAdded(HudsonInstance instance);

    /**
     * Called when an instance is removed from the manager (including the ones
     * removed by the manager agent, too).
     *
     * @param instance Hudson instance that has been just removed.
     */
    public abstract void instanceRemoved(HudsonInstance instance);

    /**
     * Start the agent. Allocate all resources, e.g. listeners.
     */
    public abstract void start();

    /**
     * Terminate the agent. Release all resources allocated in {@link #start()}.
     */
    public abstract void terminate();
}





package org.netbeans.modules.hudson.spi;

import java.awt.BorderLayout;
import java.awt.EventQueue;
import java.io.File;
import java.io.IOException;
import java.util.List;
import javax.swing.JButton;
import java.util.logging.Logger;
import org.netbeans.api.diff.Diff;
import org.netbeans.api.diff.DiffView;
import org.netbeans.api.diff.StreamSource;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJobBuild;
import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ConfigurationStatus;
import org.netbeans.modules.hudson.api.Utilities;
import org.openide.awt.StatusDisplayer;
import org.openide.util.NbBundle.Messages;
import static org.netbeans.modules.hudson.spi.Bundle.*;
import org.openide.windows.TopComponent;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

/**
 * Represents one kind of SCM (version control) supported by the Hudson integration.

    }

    /**
     * A problem with the SCM configuration.
     */
    public static final class ConfigurationStatus {

        private String errorMessage;
        private String warningMessage;
        private JButton extraButton;

        private ConfigurationStatus() {
        }

        /**
         * Creates a valid configuration.
         */
        public static ConfigurationStatus valid() {
            return new ConfigurationStatus();
        }

        /**
         * Creates a configuration with a fatal error.
         */
        public static ConfigurationStatus withError(String error) {
            ConfigurationStatus s = new ConfigurationStatus();
            s.errorMessage = error;
            return s;
        }

        /**
         * Creates a configuration with a nonfatal warning.
         */
        public static ConfigurationStatus withWarning(String warning) {
            ConfigurationStatus s = new ConfigurationStatus();
            s.warningMessage = warning;
            return s;
        }

        /**
         * Creates a similar configuration but with an extra button added to the
         * dialog.
         *
         * @see NotifyDescriptor#setAdditionalOptions
         */
        public ConfigurationStatus withExtraButton(JButton extraButton) {
            if (this.extraButton != null) {
                throw new IllegalArgumentException();
            }
            ConfigurationStatus s = new ConfigurationStatus();
            s.errorMessage = errorMessage;
            s.warningMessage = warningMessage;
            s.extraButton = extraButton;
            return s;
        }

        /**
         * for internal use only
         */
        public String getErrorMessage() {
            return errorMessage;
        }

        /**
         * for internal use only
         */
        public String getWarningMessage() {
            return warningMessage;
        }

        /**
         * for internal use only
         */
        public JButton getExtraButton() {
            return extraButton;
        }
    }

    /**
     * Attempts to convert a path in a remote Hudson workspace to a local file path.
     * May use SCM information to guess at how these paths should be aligned.
     * @param job a Hudson job

     * @return a list of parsed changelog items, or null if the SCM is unrecognized
     */
    List<? extends HudsonJobChangeItem> parseChangeSet(HudsonJobBuild build);

    /**
     * Convenience methods for SCM implementations.
     */
    class Helper {

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

        private Helper() {}

        /**
         * Add an SCM polling trigger.
         * @param configXml a {@code config.xml}
         */
        public static void addTrigger(Document configXml) {
            Element root = configXml.getDocumentElement();
            root.appendChild(configXml.createElement("triggers")). // NOI18N // XXX reuse existing <triggers> if found
                    appendChild(configXml.createElement("hudson.triggers.SCMTrigger")). // NOI18N
                    appendChild(configXml.createElement("spec")). // NOI18N
                    // XXX pretty arbitrary but seems like a decent first guess
                    appendChild(configXml.createTextNode("@hourly")); // NOI18N
        }

        @Deprecated
        public static String xpath(String expr, Element xml) {
            return Utilities.xpath(expr, xml);
        }

        /**
         * Just notify the user that a diff will be shown for a given path.
         * @param path a path, probably somehow repo-relative
         */
        @Messages({"# {0} - portion of file path", "HudsonSCM.loading_diff=Loading diff for {0}..."})
        public static void noteWillShowDiff(String path) {
            StatusDisplayer.getDefault().setStatusText(HudsonSCM_loading_diff(path));
        }

        /**
         * Display a diff window for a file.
         * @param before the former contents
         * @param after the new contents
         * @param path some representation of the file path
         */
        @Messages({"# {0} - file basename", "HudsonSCM.diffing=Diffing {0}"})
        public static void showDiff(final StreamSource before, final StreamSource after, final String path) {
            EventQueue.invokeLater(new Runnable() {
                @Override public void run() {
                    try {
                        DiffView view = Diff.getDefault().createDiff(before, after);
                        // XXX reuse the same TC
                        DiffTopComponent tc = new DiffTopComponent(view);
                        tc.setName(path);
                        tc.setDisplayName(HudsonSCM_diffing(path.replaceFirst(".+/", "")));
                        tc.open();
                        tc.requestActive();
                    } catch (IOException x) {
                        LOG.log(Level.INFO, null, x);
                    }
                }
            });
        }
        private static class DiffTopComponent extends TopComponent {
            DiffTopComponent(DiffView view) {
                setLayout(new BorderLayout());
                add(view.getComponent(), BorderLayout.CENTER);
            }
            public @Override int getPersistenceType() {
                return TopComponent.PERSISTENCE_NEVER;
            }
            protected @Override String preferredID() {
                return "DiffTopComponent"; // NOI18N
            }
        }

    }

}

Lines 319-324 Link Here

(-)a/nbbuild/cluster.properties (+1 lines)
319	hudson.mercurial,\	319	hudson.mercurial,\
320	hudson.subversion,\	320	hudson.subversion,\
321	hudson.tasklist,\	321	hudson.tasklist,\
		322	hudson.ui,\
322	ide.kit,\	323	ide.kit,\
323	image,\	324	image,\
324	javascript2.editor,\	325	javascript2.editor,\

Lines 43-49 Link Here

(-)a/odcs.hudson/nbproject/project.xml (-1 / +9 lines)
43	<build-prerequisite/>	43	<build-prerequisite/>
44	<compile-dependency/>	44	<compile-dependency/>
45	<run-dependency>	45	<run-dependency>
46	<specification-version>1.27</specification-version>	46	<specification-version>2.0</specification-version>
		47	</run-dependency>
		48	</dependency>
		49	<dependency>
		50	<code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
		51	<build-prerequisite/>
		52	<compile-dependency/>
		53	<run-dependency>
		54	<specification-version>1.0</specification-version>
47	</run-dependency>	55	</run-dependency>
48	</dependency>	56	</dependency>
49	<dependency>	57	<dependency>

Lines 72-80 Link Here

(-)a/odcs.hudson/src/org/netbeans/modules/odcs/hudson/ODCSBuilderAccessor.java (-2 / +2 lines)
72	import org.netbeans.modules.hudson.api.HudsonJob;	72	import org.netbeans.modules.hudson.api.HudsonJob;
73	import org.netbeans.modules.hudson.api.HudsonJobBuild;	73	import org.netbeans.modules.hudson.api.HudsonJobBuild;
74	import org.netbeans.modules.hudson.api.HudsonManager;	74	import org.netbeans.modules.hudson.api.HudsonManager;
75	import org.netbeans.modules.hudson.api.UI;	75	import org.netbeans.modules.hudson.ui.api.UI;
		76	import org.netbeans.modules.odcs.api.ODCSProject;
76	import org.netbeans.modules.odcs.api.ODCSServer;	77	import org.netbeans.modules.odcs.api.ODCSServer;
77	import org.netbeans.modules.odcs.api.ODCSProject;
78	import org.netbeans.modules.odcs.ui.api.ODCSUiServer;	78	import org.netbeans.modules.odcs.ui.api.ODCSUiServer;
79	import org.netbeans.modules.team.ui.common.DefaultDashboard;	79	import org.netbeans.modules.team.ui.common.DefaultDashboard;
80	import org.netbeans.modules.team.ui.spi.BuildHandle;	80	import org.netbeans.modules.team.ui.spi.BuildHandle;




    }

    /**
     * Check that mock instances work as expected.
     */
    @Test
    public void testMocks() throws ODCSException, MalformedURLException,
            MalformedURLException {

        ODCSClient client = ODCSFactory.getInstance().createClient(
                "http://test/", new PasswordAuthentication(
                "mockUser", "password".toCharArray()));
        assertNotNull(client);
        Project project = client.getProjectById("mockProject");
        assertEquals("Mock Test Project", project.getDescription());

        ProjectHandle<ODCSProject> handle = TestUtils.createMockHandle(
                "http://test/", "mockProject");
        assertNotNull(handle);
        assertEquals("Mock Project", handle.getDisplayName());
    }

    /**
     * Check that the job handle for mock job has correct name.
     */
    @Test

        }

        @Override
        public Collection<? extends HudsonJobChangeItem> getJobBuildChanges(HudsonJobBuild build) {
            return Collections.emptyList();
        }

        @Override
        public ConsoleDataProvider getConsoleDataProvider() {
            return null;
        }

        @Override
        public FailureDataProvider getFailureDataProvider() {
            return null;
        }

        @Override
        public Collection<? extends HudsonJobChangeItem> getJobBuildChanges(HudsonJobBuild build) {
            return Collections.emptyList();
        }
    }

    /**

Return to bug 229459

Lines 65-87 Link Here

(-)a/hudson.ant/src/org/netbeans/modules/hudson/ant/JobCreator.java (-6 / +6 lines)
65	import org.netbeans.modules.hudson.ant.AntBasedJobCreator.ArchivePattern;	65	import org.netbeans.modules.hudson.ant.AntBasedJobCreator.ArchivePattern;
66	import org.netbeans.modules.hudson.ant.AntBasedJobCreator.Configuration;	66	import org.netbeans.modules.hudson.ant.AntBasedJobCreator.Configuration;
67	import org.netbeans.modules.hudson.ant.AntBasedJobCreator.Target;	67	import org.netbeans.modules.hudson.ant.AntBasedJobCreator.Target;
		68	import static org.netbeans.modules.hudson.ant.Bundle.*;
		69	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory;
		70	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory.Helper;
		71	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonJobCreatorFactory.ProjectHudsonJobCreator;
68	import org.netbeans.modules.hudson.spi.HudsonSCM;	72	import org.netbeans.modules.hudson.spi.HudsonSCM;
69	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory;	73	import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
70	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ConfigurationStatus;
71	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.Helper;
72	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ProjectHudsonJobCreator;
73	import org.netbeans.modules.java.api.common.project.ui.customizer.ProjectSharability;	74	import org.netbeans.modules.java.api.common.project.ui.customizer.ProjectSharability;
74	import org.openide.awt.Mnemonics;	75	import org.openide.awt.Mnemonics;
75	import org.openide.filesystems.FileObject;	76	import org.openide.filesystems.FileObject;
76	import org.openide.filesystems.FileUtil;	77	import org.openide.filesystems.FileUtil;
77	import org.openide.util.Lookup;	78	import org.openide.util.Lookup;
		79	import org.openide.util.NbBundle.Messages;
78	import org.openide.util.lookup.ServiceProvider;	80	import org.openide.util.lookup.ServiceProvider;
79	import org.openide.xml.XMLUtil;	81	import org.openide.xml.XMLUtil;
80	import org.w3c.dom.Document;	82	import org.w3c.dom.Document;
81	import org.w3c.dom.Element;	83	import org.w3c.dom.Element;
82	import org.xml.sax.InputSource;	84	import org.xml.sax.InputSource;
83	import static org.netbeans.modules.hudson.ant.Bundle.*;
84	import org.openide.util.NbBundle.Messages;
85		85
86	public class JobCreator extends JPanel implements ProjectHudsonJobCreator {	86	public class JobCreator extends JPanel implements ProjectHudsonJobCreator {
87		87

Lines 61-69 Link Here

(-)a/hudson.git/src/org/netbeans/modules/hudson/git/HudsonGitSCM.java (-2 / +3 lines)
61	import org.netbeans.modules.hudson.api.HudsonJobBuild;	61	import org.netbeans.modules.hudson.api.HudsonJobBuild;
62	import org.netbeans.modules.hudson.api.Utilities;	62	import org.netbeans.modules.hudson.api.Utilities;
63	import static org.netbeans.modules.hudson.git.Bundle.*;	63	import static org.netbeans.modules.hudson.git.Bundle.*;
		64	import org.netbeans.modules.hudson.ui.api.HudsonSCMHelper;
64	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;	65	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;
65	import org.netbeans.modules.hudson.spi.HudsonSCM;	66	import org.netbeans.modules.hudson.spi.HudsonSCM;
66	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ConfigurationStatus;	67	import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
67	import org.openide.util.NbBundle.Messages;	68	import org.openide.util.NbBundle.Messages;
68	import org.openide.util.lookup.ServiceProvider;	69	import org.openide.util.lookup.ServiceProvider;
69	import org.openide.windows.OutputListener;	70	import org.openide.windows.OutputListener;
Lines 96-102 Link Here
96	// Note that all this will be wrong if the local repo is using a nondefault remote, or a branch, etc. etc.	97	// Note that all this will be wrong if the local repo is using a nondefault remote, or a branch, etc. etc.
97	configXmlSCM.appendChild(doc.createElement("source")).appendChild(doc.createTextNode(replacement != null ? replacement : origin.toString()));	98	configXmlSCM.appendChild(doc.createElement("source")).appendChild(doc.createTextNode(replacement != null ? replacement : origin.toString()));
98	// XXX consider <clean>true</clean> (though it does not seem to work)	99	// XXX consider <clean>true</clean> (though it does not seem to work)
99	Helper.addTrigger(doc);	100	HudsonSCMHelper.addTrigger(doc);
100	}	101	}
101	@Override public ConfigurationStatus problems() {	102	@Override public ConfigurationStatus problems() {
102	if (origin == null) {	103	if (origin == null) {

Lines 64-70 Link Here

(-)a/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java (-3 / +16 lines)
64	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;	64	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;
65	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile.EditType;	65	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile.EditType;
66	import org.netbeans.modules.hudson.spi.HudsonSCM;	66	import org.netbeans.modules.hudson.spi.HudsonSCM;
67	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ConfigurationStatus;	67	import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
		68	import org.netbeans.modules.hudson.ui.api.HudsonSCMHelper;
68	import org.openide.util.NbBundle.Messages;	69	import org.openide.util.NbBundle.Messages;
69	import org.openide.util.lookup.ServiceProvider;	70	import org.openide.util.lookup.ServiceProvider;
70	import org.openide.windows.OutputListener;	71	import org.openide.windows.OutputListener;
Lines 107-113 Link Here
107	configXmlSCM.appendChild(doc.createElement("source")).appendChild(doc.createTextNode(repo)); // NOI18N	108	configXmlSCM.appendChild(doc.createElement("source")).appendChild(doc.createTextNode(repo)); // NOI18N
108	configXmlSCM.appendChild(doc.createElement("modules")).appendChild(doc.createTextNode("")); // NOI18N	109	configXmlSCM.appendChild(doc.createElement("modules")).appendChild(doc.createTextNode("")); // NOI18N
109	configXmlSCM.appendChild(doc.createElement("clean")).appendChild(doc.createTextNode("true")); // NOI18N	110	configXmlSCM.appendChild(doc.createElement("clean")).appendChild(doc.createTextNode("true")); // NOI18N
110	Helper.addTrigger(doc);	111	HudsonSCMHelper.addTrigger(doc);
111	}	112	}
112	public ConfigurationStatus problems() {	113	public ConfigurationStatus problems() {
113	if (result.isFoundInParenFolder()) {	114	if (result.isFoundInParenFolder()) {
Lines 292-298 Link Here
292	} else {	293	} else {
293	String defaultPullNoPassword = defaultPull.replaceFirst("//[^/]+(:[^/]+)?@", "//");	294	String defaultPullNoPassword = defaultPull.replaceFirst("//[^/]+(:[^/]+)?@", "//");
294	try {	295	try {
295	return repository.resolve(new URI(defaultPullNoPassword));	296	return repository.resolve(stringToURI(defaultPullNoPassword));
296	} catch (URISyntaxException x) {	297	} catch (URISyntaxException x) {
297	LOG.log(Level.FINE, "{0} is not a valid URI", defaultPullNoPassword);	298	LOG.log(Level.FINE, "{0} is not a valid URI", defaultPullNoPassword);
298	return null;	299	return null;
Lines 301-306 Link Here
301	}	302	}
302		303
303	/**	304	/**
		305	* Convert string to URI. Ensure that drive letters in paths like
		306	* C:/something are not used as protocol part of the URI.
		307	*/
		308	private static URI stringToURI(String s) throws URISyntaxException {
		309	String withProtocol = org.openide.util.Utilities.isWindows()
		310	&& s.matches("\\w:/[^/].*") //NOI18N
		311	? "file:/" + s //NOI18N
		312	: s;
		313	return new URI(withProtocol);
		314	}
		315
		316	/**
304	* Result of finding the default pull. Instances of this class are created	317	* Result of finding the default pull. Instances of this class are created
305	* by method {@link #findDefaultPull(java.io.File)}	318	* by method {@link #findDefaultPull(java.io.File)}
306	*/	319	*/

Lines 58-67 Link Here

(-)a/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/MercurialHyperlink.java (-3 / +3 lines)
58	import java.util.regex.Matcher;	58	import java.util.regex.Matcher;
59	import java.util.regex.Pattern;	59	import java.util.regex.Pattern;
60	import org.netbeans.api.diff.StreamSource;	60	import org.netbeans.api.diff.StreamSource;
		61	import org.netbeans.modules.hudson.ui.api.HudsonSCMHelper;
61	import static org.netbeans.modules.hudson.mercurial.Bundle.*;	62	import static org.netbeans.modules.hudson.mercurial.Bundle.*;
62	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile;	63	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile;
63	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile.EditType;	64	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile.EditType;
64	import org.netbeans.modules.hudson.spi.HudsonSCM.Helper;
65	import org.openide.filesystems.FileUtil;	65	import org.openide.filesystems.FileUtil;
66	import org.openide.util.NbBundle.Messages;	66	import org.openide.util.NbBundle.Messages;
67	import org.openide.util.RequestProcessor;	67	import org.openide.util.RequestProcessor;
Lines 89-101 Link Here
89	}	89	}
90		90
91	public void outputLineAction(OutputEvent ev) {	91	public void outputLineAction(OutputEvent ev) {
92	Helper.noteWillShowDiff(file.getName());	92	HudsonSCMHelper.noteWillShowDiff(file.getName());
93	RP.post(new Runnable() {	93	RP.post(new Runnable() {
94	public void run() {	94	public void run() {
95	try {	95	try {
96	final StreamSource before = makeSource(false);	96	final StreamSource before = makeSource(false);
97	final StreamSource after = makeSource(true);	97	final StreamSource after = makeSource(true);
98	Helper.showDiff(before, after, file.getName());	98	HudsonSCMHelper.showDiff(before, after, file.getName());
99	} catch (IOException x) {	99	} catch (IOException x) {
100	LOG.log(Level.INFO, null, x);	100	LOG.log(Level.INFO, null, x);
101	}	101	}

Lines 59-66 Link Here

(-)a/hudson.subversion/src/org/netbeans/modules/hudson/subversion/HudsonSubversionSCM.java (-2 / +3 lines)
59	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile;	59	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile;
60	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile.EditType;	60	import org.netbeans.modules.hudson.spi.HudsonJobChangeItem.HudsonJobChangeFile.EditType;
61	import org.netbeans.modules.hudson.spi.HudsonSCM;	61	import org.netbeans.modules.hudson.spi.HudsonSCM;
62	import org.netbeans.modules.hudson.spi.ProjectHudsonJobCreatorFactory.ConfigurationStatus;	62	import org.netbeans.modules.hudson.spi.HudsonSCM.ConfigurationStatus;
63	import static org.netbeans.modules.hudson.subversion.Bundle.*;	63	import static org.netbeans.modules.hudson.subversion.Bundle.*;
		64	import org.netbeans.modules.hudson.ui.api.HudsonSCMHelper;
64	import org.openide.util.NbBundle.Messages;	65	import org.openide.util.NbBundle.Messages;
65	import org.openide.util.lookup.ServiceProvider;	66	import org.openide.util.lookup.ServiceProvider;
66	import org.openide.windows.OutputListener;	67	import org.openide.windows.OutputListener;
Lines 99-105 Link Here
99	loc.appendChild(doc.createElement("local")).appendChild(doc.createTextNode(".")); // NOI18N	100	loc.appendChild(doc.createElement("local")).appendChild(doc.createTextNode(".")); // NOI18N
100	// HUDSON-3390 would be a more attractive alternative:	101	// HUDSON-3390 would be a more attractive alternative:
101	configXmlSCM.appendChild(doc.createElement("useUpdate")).appendChild(doc.createTextNode("false")); // NOI18N	102	configXmlSCM.appendChild(doc.createElement("useUpdate")).appendChild(doc.createTextNode("false")); // NOI18N
102	Helper.addTrigger(doc);	103	HudsonSCMHelper.addTrigger(doc);
103	}	104	}
104	public @Override ConfigurationStatus problems() {	105	public @Override ConfigurationStatus problems() {
105	return null;	106	return null;

Line 0 Link Here

(-)a/hudson.ui/nbproject/project.xml (+250 lines)
		1	<?xml version="1.0" encoding="UTF-8"?>
		2	<project xmlns="http://www.netbeans.org/ns/project/1">
		3	<type>org.netbeans.modules.apisupport.project</type>
		4	<configuration>
		5	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
		6	<code-name-base>org.netbeans.modules.hudson.ui</code-name-base>
		7	<module-dependencies>
		8	<dependency>
		9	<code-name-base>org.netbeans.api.annotations.common</code-name-base>
		10	<build-prerequisite/>
		11	<compile-dependency/>
		12	<run-dependency>
		13	<release-version>1</release-version>
		14	<specification-version>1.20</specification-version>
		15	</run-dependency>
		16	</dependency>
		17	<dependency>
		18	<code-name-base>org.netbeans.api.java.classpath</code-name-base>
		19	<build-prerequisite/>
		20	<compile-dependency/>
		21	<run-dependency>
		22	<release-version>1</release-version>
		23	<specification-version>1.38</specification-version>
		24	</run-dependency>
		25	</dependency>
		26	<dependency>
		27	<code-name-base>org.netbeans.api.progress</code-name-base>
		28	<build-prerequisite/>
		29	<compile-dependency/>
		30	<run-dependency>
		31	<release-version>1</release-version>
		32	<specification-version>1.34</specification-version>
		33	</run-dependency>
		34	</dependency>
		35	<dependency>
		36	<code-name-base>org.netbeans.core.ide</code-name-base>
		37	<build-prerequisite/>
		38	<compile-dependency/>
		39	<run-dependency>
		40	<release-version>1</release-version>
		41	<specification-version>1.33</specification-version>
		42	</run-dependency>
		43	</dependency>
		44	<dependency>
		45	<code-name-base>org.netbeans.libs.commons_net</code-name-base>
		46	<build-prerequisite/>
		47	<compile-dependency/>
		48	<run-dependency>
		49	<release-version>2</release-version>
		50	<specification-version>2.11</specification-version>
		51	</run-dependency>
		52	</dependency>
		53	<dependency>
		54	<code-name-base>org.netbeans.modules.diff</code-name-base>
		55	<build-prerequisite/>
		56	<compile-dependency/>
		57	<run-dependency>
		58	<release-version>1</release-version>
		59	<specification-version>1.43</specification-version>
		60	</run-dependency>
		61	</dependency>
		62	<dependency>
		63	<code-name-base>org.netbeans.modules.gsf.testrunner</code-name-base>
		64	<build-prerequisite/>
65	<compile-dependency/>
66	<run-dependency>
67	<release-version>1</release-version>
68	<specification-version>1.34</specification-version>
69	</run-dependency>
70	</dependency>
71	<dependency>
72	<code-name-base>org.netbeans.modules.hudson</code-name-base>
73	<build-prerequisite/>
74	<compile-dependency/>
75	<run-dependency>
76	<specification-version>2.0</specification-version>
77	</run-dependency>
78	</dependency>
79	<dependency>
80	<code-name-base>org.netbeans.modules.keyring</code-name-base>
81	<build-prerequisite/>
82	<compile-dependency/>
83	<run-dependency>
84	<specification-version>1.16</specification-version>
85	</run-dependency>
86	</dependency>
87	<dependency>
88	<code-name-base>org.netbeans.modules.options.api</code-name-base>
89	<build-prerequisite/>
90	<compile-dependency/>
91	<run-dependency>
92	<release-version>1</release-version>
93	<specification-version>1.35</specification-version>
94	</run-dependency>
95	</dependency>
96	<dependency>
97	<code-name-base>org.netbeans.modules.projectapi</code-name-base>
98	<build-prerequisite/>
99	<compile-dependency/>
100	<run-dependency>
101	<release-version>1</release-version>
102	<specification-version>1.53</specification-version>
103	</run-dependency>
104	</dependency>
105	<dependency>
106	<code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
107	<build-prerequisite/>
108	<compile-dependency/>
109	<run-dependency>
110	<release-version>1</release-version>
111	<specification-version>1.70</specification-version>
112	</run-dependency>
113	</dependency>
114	<dependency>
115	<code-name-base>org.netbeans.spi.quicksearch</code-name-base>
116	<build-prerequisite/>
117	<compile-dependency/>
118	<run-dependency>
119	<specification-version>1.19</specification-version>
120	</run-dependency>
121	</dependency>
122	<dependency>
123	<code-name-base>org.openide.actions</code-name-base>
124	<build-prerequisite/>
125	<compile-dependency/>
126	<run-dependency>
127	<specification-version>6.31</specification-version>
128	</run-dependency>
129	</dependency>
130	<dependency>
131	<code-name-base>org.openide.awt</code-name-base>
132	<build-prerequisite/>
133	<compile-dependency/>
134	<run-dependency>
135	<specification-version>7.58</specification-version>
136	</run-dependency>
137	</dependency>
138	<dependency>
139	<code-name-base>org.openide.dialogs</code-name-base>
140	<build-prerequisite/>
141	<compile-dependency/>
142	<run-dependency>
143	<specification-version>7.31</specification-version>
144	</run-dependency>
145	</dependency>
146	<dependency>
147	<code-name-base>org.openide.explorer</code-name-base>
148	<build-prerequisite/>
149	<compile-dependency/>
150	<run-dependency>
151	<specification-version>6.52</specification-version>
152	</run-dependency>
153	</dependency>
154	<dependency>
155	<code-name-base>org.openide.filesystems</code-name-base>
156	<build-prerequisite/>
157	<compile-dependency/>
158	<run-dependency>
159	<specification-version>8.7</specification-version>
160	</run-dependency>
161	</dependency>
162	<dependency>
163	<code-name-base>org.openide.io</code-name-base>
164	<build-prerequisite/>
165	<compile-dependency/>
166	<run-dependency>
167	<specification-version>1.37</specification-version>
168	</run-dependency>
169	</dependency>
170	<dependency>
171	<code-name-base>org.openide.loaders</code-name-base>
172	<build-prerequisite/>
173	<compile-dependency/>
174	<run-dependency>
175	<specification-version>7.49</specification-version>
176	</run-dependency>
177	</dependency>
178	<dependency>
179	<code-name-base>org.openide.nodes</code-name-base>
180	<build-prerequisite/>
181	<compile-dependency/>
182	<run-dependency>
183	<specification-version>7.35</specification-version>
184	</run-dependency>
185	</dependency>
186	<dependency>
187	<code-name-base>org.openide.text</code-name-base>
188	<build-prerequisite/>
189	<compile-dependency/>
190	<run-dependency>
191	<specification-version>6.56</specification-version>
192	</run-dependency>
193	</dependency>
194	<dependency>
195	<code-name-base>org.openide.util</code-name-base>
196	<build-prerequisite/>
197	<compile-dependency/>
198	<run-dependency>
199	<specification-version>8.31</specification-version>
200	</run-dependency>
201	</dependency>
202	<dependency>
203	<code-name-base>org.openide.util.lookup</code-name-base>
204	<build-prerequisite/>
205	<compile-dependency/>
206	<run-dependency>
207	<specification-version>8.21</specification-version>
208	</run-dependency>
209	</dependency>
210	<dependency>
211	<code-name-base>org.openide.windows</code-name-base>
212	<build-prerequisite/>
213	<compile-dependency/>
214	<run-dependency>
215	<specification-version>6.63</specification-version>
216	</run-dependency>
217	</dependency>
218	</module-dependencies>
219	<test-dependencies>
220	<test-type>
221	<name>unit</name>
222	<test-dependency>
223	<code-name-base>org.netbeans.insane</code-name-base>
224	<compile-dependency/>
225	</test-dependency>
226	<test-dependency>
227	<code-name-base>org.netbeans.libs.junit4</code-name-base>
228	<compile-dependency/>
229	</test-dependency>
230	<test-dependency>
231	<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
232	<compile-dependency/>
233	</test-dependency>
234	</test-type>
235	</test-dependencies>
236	<friend-packages>
237	<friend>org.netbeans.modules.hudson.ant</friend>
238	<friend>org.netbeans.modules.hudson.git</friend>
239	<friend>org.netbeans.modules.hudson.maven</friend>
240	<friend>org.netbeans.modules.hudson.mercurial</friend>
241	<friend>org.netbeans.modules.hudson.php</friend>
242	<friend>org.netbeans.modules.hudson.subversion</friend>
243	<friend>org.netbeans.modules.hudson.tasklist</friend>
244	<friend>org.netbeans.modules.odcs.hudson</friend>
245	<package>org.netbeans.modules.hudson.ui.api</package>
246	<package>org.netbeans.modules.hudson.ui.spi</package>
247	</friend-packages>
248	</data>
249	</configuration>
250	</project>

Lines 49-59 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java (-5 / +4 lines)
49	import javax.swing.JPanel;	49	import javax.swing.JPanel;
50	import org.apache.commons.net.util.Base64;	50	import org.apache.commons.net.util.Base64;
51	import org.netbeans.api.keyring.Keyring;	51	import org.netbeans.api.keyring.Keyring;
		52	import org.netbeans.modules.hudson.api.HudsonManager;
52	import org.netbeans.modules.hudson.api.HudsonVersion;	53	import org.netbeans.modules.hudson.api.HudsonVersion;
53	import org.netbeans.modules.hudson.api.Utilities;	54	import org.netbeans.modules.hudson.api.Utilities;
54	import org.netbeans.modules.hudson.impl.HudsonManagerImpl;
55	import org.netbeans.modules.hudson.spi.ConnectionAuthenticator;	55	import org.netbeans.modules.hudson.spi.ConnectionAuthenticator;
56	import static org.netbeans.modules.hudson.ui.Bundle.*;
57	import org.openide.DialogDescriptor;	56	import org.openide.DialogDescriptor;
58	import org.openide.DialogDisplayer;	57	import org.openide.DialogDisplayer;
59	import org.openide.NotifyDescriptor;	58	import org.openide.NotifyDescriptor;
Lines 107-113 Link Here
107	LOG.log(Level.FINE, "enabled on {0}", home);	106	LOG.log(Level.FINE, "enabled on {0}", home);
108	}	107	}
109	APITokenConnectionAuthenticator panel = new APITokenConnectionAuthenticator();	108	APITokenConnectionAuthenticator panel = new APITokenConnectionAuthenticator();
110	String server = HudsonManagerImpl.simplifyServerLocation(home.toString(), true);	109	String server = HudsonManager.simplifyServerLocation(home.toString(), true);
111	String key = "tok." + server;	110	String key = "tok." + server;
112	String username = FormLogin.loginPrefs().get(server, null);	111	String username = FormLogin.loginPrefs().get(server, null);
113	if (username != null) {	112	if (username != null) {
Lines 118-124 Link Here
118	}	117	}
119	}	118	}
120	panel.locationField.setText(home.toString());	119	panel.locationField.setText(home.toString());
121	DialogDescriptor dd = new DialogDescriptor(panel, FormLogin_log_in());	120	DialogDescriptor dd = new DialogDescriptor(panel, Bundle.FormLogin_log_in());
122	if (DialogDisplayer.getDefault().notify(dd) != NotifyDescriptor.OK_OPTION) {	121	if (DialogDisplayer.getDefault().notify(dd) != NotifyDescriptor.OK_OPTION) {
123	return null;	122	return null;
124	}	123	}
Lines 127-133 Link Here
127	FormLogin.loginPrefs().put(server, username);	126	FormLogin.loginPrefs().put(server, username);
128	String token = new String(panel.tokField.getPassword());	127	String token = new String(panel.tokField.getPassword());
129	panel.tokField.setText("");	128	panel.tokField.setText("");
130	Keyring.save(key, token.toCharArray(), APITokenConnectionAuthenticator_password_description(home, username));	129	Keyring.save(key, token.toCharArray(), Bundle.APITokenConnectionAuthenticator_password_description(home, username));
131	BASIC_AUTH.put(home.toString(), new Base64(0).encodeToString((username + ':' + token).getBytes()).trim());	130	BASIC_AUTH.put(home.toString(), new Base64(0).encodeToString((username + ':' + token).getBytes()).trim());
132	try {	131	try {
133	return conn.getURL().openConnection();	132	return conn.getURL().openConnection();

Lines 53-66 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java (-9 / +11 lines)
53	import org.netbeans.api.progress.ProgressHandle;	53	import org.netbeans.api.progress.ProgressHandle;
54	import org.netbeans.api.progress.ProgressHandleFactory;	54	import org.netbeans.api.progress.ProgressHandleFactory;
55	import org.netbeans.modules.hudson.api.ConnectionBuilder;	55	import org.netbeans.modules.hudson.api.ConnectionBuilder;
56	import org.netbeans.modules.hudson.api.UI;	56	import org.netbeans.modules.hudson.api.HudsonManager;
57	import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;	57	import org.netbeans.modules.hudson.ui.api.UI;
58	import org.openide.DialogDisplayer;	58	import org.openide.DialogDisplayer;
59	import org.openide.NotifyDescriptor;	59	import org.openide.NotifyDescriptor;
60	import org.openide.util.Cancellable;	60	import org.openide.util.Cancellable;
61	import org.openide.util.NbBundle.Messages;	61	import org.openide.util.NbBundle.Messages;
62	import org.openide.util.RequestProcessor;	62	import org.openide.util.RequestProcessor;
63	import static org.netbeans.modules.hudson.ui.actions.Bundle.*;
64		63
65	/**	64	/**
66	* #161911: downloads & runs latest hudson.war and configures it for you.	65	* #161911: downloads & runs latest hudson.war and configures it for you.
Lines 71-79 Link Here
71		70
72	@Messages("AddTestInstanceAction.label=Try Hudson on &Localhost")	71	@Messages("AddTestInstanceAction.label=Try Hudson on &Localhost")
73	public AddTestInstanceAction() {	72	public AddTestInstanceAction() {
74	super(AddTestInstanceAction_label());	73	super(Bundle.AddTestInstanceAction_label());
75	}	74	}
76		75
		76	@Override
77	public void actionPerformed(ActionEvent e) {	77	public void actionPerformed(ActionEvent e) {
78	RequestProcessor.getDefault().post(this);	78	RequestProcessor.getDefault().post(this);
79	}	79	}
Lines 84-89 Link Here
84	"AddTestInstanceAction.starting=Downloading & running Hudson...",	84	"AddTestInstanceAction.starting=Downloading & running Hudson...",
85	"AddTestInstanceAction.instance_name=Local Test Server"	85	"AddTestInstanceAction.instance_name=Local Test Server"
86	})	86	})
		87	@Override
87	public void run() {	88	public void run() {
88	// XXX could use JavaPlatformManager.default.defaultPlatform.findTool("javaws") if could depend on java.platform	89	// XXX could use JavaPlatformManager.default.defaultPlatform.findTool("javaws") if could depend on java.platform
89	File javaHome = new File(System.getProperty("java.home"));	90	File javaHome = new File(System.getProperty("java.home"));
Lines 96-118 Link Here
96	javaws = new File(bindir, "javaws");	97	javaws = new File(bindir, "javaws");
97	}	98	}
98	if (!javaws.isFile()) {	99	if (!javaws.isFile()) {
99	warning(AddTestInstanceAction_no_javaws(javaws));	100	warning(Bundle.AddTestInstanceAction_no_javaws(javaws));
100	return;	101	return;
101	}	102	}
102	try {	103	try {
103	int exit = new ProcessBuilder(javaws.getAbsolutePath(), "https://hudson.dev.java.net/hudson.jnlp").start().waitFor();	104	int exit = new ProcessBuilder(javaws.getAbsolutePath(), "https://hudson.dev.java.net/hudson.jnlp").start().waitFor();
104	if (exit != 0) {	105	if (exit != 0) {
105	warning(AddTestInstanceAction_could_not_run());	106	warning(Bundle.AddTestInstanceAction_could_not_run());
106	return;	107	return;
107	}	108	}
108	} catch (Exception x) {	109	} catch (Exception x) {
109	warning(AddTestInstanceAction_could_not_run());	110	warning(Bundle.AddTestInstanceAction_could_not_run());
110	LOG.log(Level.INFO, null, x);	111	LOG.log(Level.INFO, null, x);
111	return;	112	return;
112	}	113	}
113	final AtomicBoolean cancelled = new AtomicBoolean();	114	final AtomicBoolean cancelled = new AtomicBoolean();
114	ProgressHandle progress = ProgressHandleFactory.createHandle(	115	ProgressHandle progress = ProgressHandleFactory.createHandle(
115	AddTestInstanceAction_starting(), new Cancellable() {	116	Bundle.AddTestInstanceAction_starting(), new Cancellable() {
		117	@Override
116	public boolean cancel() {	118	public boolean cancel() {
117	cancelled.set(true);	119	cancelled.set(true);
118	return true;	120	return true;
Lines 130-136 Link Here
130	try {	132	try {
131	new ConnectionBuilder().url(localhost).connection();	133	new ConnectionBuilder().url(localhost).connection();
132	// Success!	134	// Success!
133	HudsonInstanceImpl.createHudsonInstance(AddTestInstanceAction_instance_name(), localhost, "1"); // NOI18N	135	HudsonManager.addInstance(Bundle.AddTestInstanceAction_instance_name(), localhost, 1, true); // NOI18N
134	UI.selectNode(localhost);	136	UI.selectNode(localhost);
135	break;	137	break;
136	} catch (IOException x) {	138	} catch (IOException x) {

Lines 43-55 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/actions/Bundle.properties (-11 / +49 lines)
43	LBL_Add_Instance=&Add Hudson Instance...	43	LBL_Add_Instance=&Add Hudson Instance...
44		44
45	LBL_StartJobAction=&Start Job	45	LBL_StartJobAction=&Start Job
46
47	CreateJobPanel.projectLabel.text=&Project to Build:
48	CreateJobPanel.nameLabel.text=Build &Name:
49	CreateJobPanel.browse.text=&Browse...
50	CreateJobPanel.serverLabel.text=Build &Server:
51	CreateJobPanel.addServer.text=&Add...
52	CreateJobPanel.explanationLabel.text=<html>Build Server will automatically get the sources and libraries from the same\n<br>source code repository and run the same build targets as your local project.
53	ShowChanges.label=Show Changes	46	ShowChanges.label=Show Changes
54	ShowChanges.no_changes=No changes.	47	ShowChanges.no_changes=No changes.
55	# {0} - job #build	48	# {0} - job #build
Lines 59-67 Link Here
59	CreateJobPanel.unknown_project_type=The IDE does not know how to set up a job for this project.	52	CreateJobPanel.unknown_project_type=The IDE does not know how to set up a job for this project.
60	CreateJobPanel.name_taken=This name is taken. Pick another.	53	CreateJobPanel.name_taken=This name is taken. Pick another.
61	CreateJobPanel.already_associated=This project already seems to be associated with a Hudson job.	54	CreateJobPanel.already_associated=This project already seems to be associated with a Hudson job.
		55	CreateJobPanel.AccessibleContext.accessibleDescription=Create a new build job for a project.
		56	CreateJobPanel.explanationLabel.text=<html>Build Server will automatically get the sources and libraries from the same\n<br>source code repository and run the same build targets as your local project.
		57	CreateJobPanel.browse.AccessibleContext.accessibleDescription=Select a project to build from disk.
		58	CreateJobPanel.browse.text=&Browse...
		59	CreateJobPanel.project.AccessibleContext.accessibleDescription=Select project for which to create job.
		60	CreateJobPanel.nameLabel.text=Build &Name:
62	CreateJobPanel.addServer.AccessibleContext.accessibleDescription=Add a new build server.	61	CreateJobPanel.addServer.AccessibleContext.accessibleDescription=Add a new build server.
63	CreateJobPanel.browse.AccessibleContext.accessibleDescription=Select a project to build from disk.	62	CreateJobPanel.addServer.text=&Add...
		63	CreateJobPanel.projectLabel.text=&Project to Build:
		64	CreateJobPanel.name.AccessibleContext.accessibleDescription=Name of new job.
		65	CreateJobPanel.serverLabel.text=Build &Server:
		66	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		67
		68	# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
		69
		70	# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		71	# Other names may be trademarks of their respective owners.
		72
		73	# The contents of this file are subject to the terms of either the GNU
		74	# General Public License Version 2 only ("GPL") or the Common
		75	# Development and Distribution License("CDDL") (collectively, the
		76	# "License"). You may not use this file except in compliance with the
		77	# License. You can obtain a copy of the License at
		78	# http://www.netbeans.org/cddl-gplv2.html
		79	# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		80	# specific language governing permissions and limitations under the
		81	# License. When distributing the software, include this License Header
		82	# Notice in each file and include the License file at
		83	# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		84	# particular file as subject to the "Classpath" exception as provided
		85	# by Oracle in the GPL Version 2 section of the License file that
		86	# accompanied this code. If applicable, add the following below the
		87	# License Header, with the fields enclosed by brackets [] replaced by
		88	# your own identifying information:
		89	# "Portions Copyrighted [year] [name of copyright owner]"
		90
		91	# If you wish your version of this file to be governed by only the CDDL
		92	# or only the GPL Version 2, indicate your decision by adding
		93	# "[Contributor] elects to include this software in this distribution
		94	# under the [CDDL or GPL Version 2] license." If you do not indicate a
		95	# single choice of license, a recipient has the option to distribute
		96	# your version of this file under either the CDDL, the GPL Version 2 or
		97	# to extend the choice of license to its licensees as provided above.
		98	# However, if you add GPL Version 2 code and therefore, elected the GPL
		99	# Version 2 license, then the option applies only if the new code is
		100	# made subject to such option by the copyright holder.
		101
		102	# Contributor(s):
		103
		104	# Portions Copyrighted 2013 Sun Microsystems, Inc.
64	CreateJobPanel.server.AccessibleContext.accessibleDescription=Select server on which to create job.	105	CreateJobPanel.server.AccessibleContext.accessibleDescription=Select server on which to create job.
65	CreateJobPanel.project.AccessibleContext.accessibleDescription=Select project for which to create job.
66	CreateJobPanel.name.AccessibleContext.accessibleDescription=Name of new job.
67	CreateJobPanel.AccessibleContext.accessibleDescription=Create a new build job for a project.

Lines 42-81 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/actions/Hyperlinker.java (-170 / +8 lines)
42		42
43	package org.netbeans.modules.hudson.ui.actions;	43	package org.netbeans.modules.hudson.ui.actions;
44		44
45	import java.awt.Toolkit;
46	import java.io.File;
47	import java.io.IOException;
48	import java.net.MalformedURLException;
49	import java.net.URL;
50	import java.util.ArrayList;	45	import java.util.ArrayList;
51	import java.util.List;	46	import java.util.List;
52	import java.util.logging.Level;
53	import java.util.logging.Logger;	47	import java.util.logging.Logger;
54	import java.util.regex.Matcher;
55	import java.util.regex.Pattern;
56	import org.netbeans.api.project.Project;
57	import org.netbeans.modules.hudson.api.HudsonJob;	48	import org.netbeans.modules.hudson.api.HudsonJob;
58	import org.netbeans.modules.hudson.spi.HudsonLogger;	49	import org.netbeans.modules.hudson.spi.HudsonLogger;
59	import org.netbeans.modules.hudson.spi.HudsonLogger.HudsonLogSession;	50	import org.netbeans.modules.hudson.spi.HudsonLogger.HudsonLogSession;
60	import org.netbeans.modules.hudson.spi.HudsonSCM;
61	import org.netbeans.modules.hudson.spi.ProjectHudsonProvider;
62	import org.openide.awt.HtmlBrowser.URLDisplayer;
63	import org.openide.awt.StatusDisplayer;
64	import org.openide.filesystems.FileObject;
65	import org.openide.filesystems.FileUtil;
66	import org.openide.util.Lookup;	51	import org.openide.util.Lookup;
67	import org.openide.util.NbBundle.Messages;
68	import org.openide.util.RequestProcessor;
69	import org.openide.util.lookup.ServiceProvider;	52	import org.openide.util.lookup.ServiceProvider;
70	import org.openide.windows.OutputEvent;
71	import org.openide.windows.OutputListener;
72	import org.openide.windows.OutputWriter;	53	import org.openide.windows.OutputWriter;
73	import static org.netbeans.modules.hudson.ui.actions.Bundle.*;
74		54
75	/**	55	/**
76	* Manages warning/error/stack trace hyperlinking in the Output Window.	56	* Manages warning/error/stack trace hyperlinking in the Output Window.
77	*/	57	*/
78	public class Hyperlinker {	58	public final class Hyperlinker {
79		59
80	private static final Logger LOG = Logger.getLogger(Hyperlinker.class.getName());	60	private static final Logger LOG = Logger.getLogger(Hyperlinker.class.getName());
81		61
Lines 95-258 Link Here
95	break;	75	break;
96	}	76	}
97	}	77	}
98	// PlainLogger is last and always handles it	78	// DefaultLogger is last and always handles it
99	}	79	}
100		80
101	static class PlainLoggerLogic {	81	@ServiceProvider(service = HudsonLogger.class, position = Integer.MAX_VALUE)
102	private static final Pattern REMOTE_URL = Pattern.compile("\\b(https?://[^\\s)>]+)");	82	public static final class DefaultLogger implements HudsonLogger {
103	private final HudsonJob job;
104	/** Looks for errors mentioning workspace files. Prefix captures Maven's [WARNING], Ant's [javac], etc. */
105	private final Pattern hyperlinkable;
106	PlainLoggerLogic(HudsonJob job, String jobName) {
107	this.job = job;
108	// XXX support Windows build servers (using backslashes)
109	String jobNameQ = Pattern.quote(jobName);
110	hyperlinkable = Pattern.compile("\\s*(?:\\[.+\\] )?/.+?/(?:jobs/" + jobNameQ + "/workspace\|workspace/" + jobNameQ + // NOI18N
111	")/([^:]+):(?:\\[?([0-9]+)[:,](?:([0-9]+)[]:])?)? (?:warning: )?(.+)"); // NOI18N
112	}
113	OutputListener findHyperlink(String line) {
114	try {
115	Matcher m = hyperlinkable.matcher(line);
116	if (m.matches()) {
117	final String path = m.group(1);
118	final int row = m.group(2) != null ? Integer.parseInt(m.group(2)) - 1 : -1;
119	final int col = m.group(3) != null ? Integer.parseInt(m.group(3)) - 1 : -1;
120	final String message = m.group(4);
121	return new Hyperlink(job, path, message, row, col);
122	}
123	m = REMOTE_URL.matcher(line);
124	if (m.matches()) {
125	return new URLHyperlink(new URL(m.group()));
126	}
127	} catch (MalformedURLException x) {
128	LOG.log(Level.FINE, null, x);
129	}
130	return null;
131	}
132	}
133		83
134	@ServiceProvider(service=HudsonLogger.class)	84	@Override
135	public static final class PlainLogger implements HudsonLogger {	85	public HudsonLogSession createSession(HudsonJob job) {
136	public HudsonLogSession createSession(final HudsonJob job) {
137	return new HudsonLogSession() {	86	return new HudsonLogSession() {
138	final PlainLoggerLogic logic = new PlainLoggerLogic(job, job.getName());	87
		88	@Override
139	public boolean handle(String line, OutputWriter stream) {	89	public boolean handle(String line, OutputWriter stream) {
140	OutputListener link = logic.findHyperlink(line);
141	if (link != null) {
142	try {
143	stream.println(line, link);
144	return true;
145	} catch (IOException x) {
146	LOG.log(Level.INFO, null, x);
147	}
148	}
149	stream.println(line);	90	stream.println(line);
150	return true;	91	return true;
151	}	92	}
152	};	93	};
153	}	94	}
154	}	95	}
155
156	private static class Hyperlink implements OutputListener {
157
158	private static final RequestProcessor RP = new RequestProcessor(Hyperlink.class);
159
160	private final HudsonJob job;
161	private final String path;
162	private final String message;
163	private final int row;
164	private final int col;
165
166	public Hyperlink(HudsonJob job, String path, String message, int row, int col) {
167	this.job = job;
168	this.path = path;
169	this.message = message;
170	this.row = row;
171	this.col = col;
172	}
173
174	public void outputLineAction(OutputEvent ev) {
175	acted(true);
176	}
177
178	public void outputLineSelected(OutputEvent ev) {
179	acted(false);
180	}
181
182	@Messages({"# {0} - file path in workspace", "Hyperlinker.looking_for=Looking for {0}...", "# {0} - file path in workspace", "Hyperlinker.not_found=No file {0} found in remote workspace."})
183	private void acted(final boolean force) {
184	RP.post(new Runnable() {
185	public void run() {
186	FileObject f = null;
187	Project p = ProjectHudsonProvider.getDefault().findAssociatedProject(ProjectHudsonProvider.Association.forJob(job));
188	if (p != null) {
189	String localPath = null;
190	File localRoot = FileUtil.toFile(p.getProjectDirectory());
191	if (localRoot != null) {
192	for (HudsonSCM scm : Lookup.getDefault().lookupAll(HudsonSCM.class)) {
193	localPath = scm.translateWorkspacePath(job, path, localRoot);
194	if (localPath != null) {
195	LOG.log(Level.FINE, "Translating remote path {0} to {1} using {2}", new Object[] {path, localPath, scm});
196	break;
197	}
198	}
199	}
200	if (localPath == null) {
201	LOG.fine("Falling back to guess that remote workspace is a project root");
202	localPath = path;
203	}
204	// XXX permit localPath to include ../ segments; for Hg this is reasonable
205	f = p.getProjectDirectory().getFileObject(localPath);
206	LOG.log(Level.FINE, "Tried to find local file in {0} at {1} using {2}", new Object[] {p, f, localPath});
207	// XXX #159829: consider aligning local line number with remote line number somehow
208	}
209	if (f == null) {
210	StatusDisplayer.getDefault().setStatusText(Hyperlinker_looking_for(path));
211	f = job.getRemoteWorkspace().findResource(path);
212	LOG.log(Level.FINE, "Tried to find remote file at {0} using {1}", new Object[] {f, path});
213	}
214	if (f == null) {
215	if (force) {
216	StatusDisplayer.getDefault().setStatusText(Hyperlinker_not_found(path));
217	Toolkit.getDefaultToolkit().beep();
218	}
219	return;
220	}
221	// XXX could be useful to select this file in the workspace node (see related #159838)
222	StatusDisplayer.getDefault().setStatusText(message);
223	HudsonLogger.Helper.openAt(f, row, col, force);
224	}
225	});
226	}
227
228	public void outputLineCleared(OutputEvent ev) {}
229
230	public @Override String toString() {
231	return path + ":" + row + ":" + col + ":" + message; // NOI18N
232	}
233
234	}
235
236	private static class URLHyperlink implements OutputListener {
237
238	private final URL u;
239
240	URLHyperlink(URL u) {
241	this.u = u;
242	}
243
244	public void outputLineAction(OutputEvent ev) {
245	URLDisplayer.getDefault().showURL(u);
246	}
247
248	public void outputLineSelected(OutputEvent ev) {}
249
250	public void outputLineCleared(OutputEvent ev) {}
251
252	public @Override String toString() {
253	return u.toString();
254	}
255
256	}
257
258	}	96	}

Lines 51-57 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/actions/LogInAction.java (-3 / +2 lines)
51	import javax.swing.AbstractAction;	51	import javax.swing.AbstractAction;
52	import org.netbeans.modules.hudson.api.ConnectionBuilder;	52	import org.netbeans.modules.hudson.api.ConnectionBuilder;
53	import org.netbeans.modules.hudson.api.HudsonInstance;	53	import org.netbeans.modules.hudson.api.HudsonInstance;
54	import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
55	import org.netbeans.modules.hudson.spi.ConnectionAuthenticator;	54	import org.netbeans.modules.hudson.spi.ConnectionAuthenticator;
56	import org.openide.awt.ActionRegistration;	55	import org.openide.awt.ActionRegistration;
57	import org.openide.awt.ActionID;	56	import org.openide.awt.ActionID;
Lines 69-77 Link Here
69	private static final Logger LOG = Logger.getLogger(LogInAction.class.getName());	68	private static final Logger LOG = Logger.getLogger(LogInAction.class.getName());
70	private static final RequestProcessor RP = new RequestProcessor(LogInAction.class);	69	private static final RequestProcessor RP = new RequestProcessor(LogInAction.class);
71		70
72	private final HudsonInstanceImpl instance;	71	private final HudsonInstance instance;
73		72
74	public LogInAction(HudsonInstanceImpl instance) {	73	public LogInAction(HudsonInstance instance) {
75	super(Bundle.CTL_LogInAction());	74	super(Bundle.CTL_LogInAction());
76	this.instance = instance;	75	this.instance = instance;
77	}	76	}

Lines 51-57 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/actions/PersistInstanceAction.java (-8 / +8 lines)
51	import java.awt.event.ActionEvent;	51	import java.awt.event.ActionEvent;
52	import java.util.Collections;	52	import java.util.Collections;
53	import org.netbeans.modules.hudson.api.HudsonInstance;	53	import org.netbeans.modules.hudson.api.HudsonInstance;
54	import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;	54	import org.netbeans.modules.hudson.api.Utilities;
55	import org.openide.awt.ActionID;	55	import org.openide.awt.ActionID;
56	import org.openide.awt.ActionReference;	56	import org.openide.awt.ActionReference;
57	import org.openide.awt.ActionRegistration;	57	import org.openide.awt.ActionRegistration;
Lines 67-85 Link Here
67	public class PersistInstanceAction extends AbstractAction implements ContextAwareAction {	67	public class PersistInstanceAction extends AbstractAction implements ContextAwareAction {
68		68
69	public PersistInstanceAction() {	69	public PersistInstanceAction() {
70	this(Collections.<HudsonInstanceImpl>emptyList());	70	this(Collections.<HudsonInstance>emptyList());
71	}	71	}
72		72
73	public @Override Action createContextAwareInstance(Lookup actionContext) {	73	public @Override Action createContextAwareInstance(Lookup actionContext) {
74	return new PersistInstanceAction(actionContext.lookupAll(HudsonInstanceImpl.class));	74	return new PersistInstanceAction(actionContext.lookupAll(HudsonInstance.class));
75	}	75	}
76		76
77	private final Collection<? extends HudsonInstanceImpl> instances;	77	private final Collection<? extends HudsonInstance> instances;
78		78
79	private PersistInstanceAction(Collection<? extends HudsonInstanceImpl> instances) {	79	private PersistInstanceAction(Collection<? extends HudsonInstance> instances) {
80	super(LBL_Persist_Instance());	80	super(LBL_Persist_Instance());
81	this.instances = instances;	81	this.instances = instances;
82	for (HudsonInstanceImpl instance : instances) {	82	for (HudsonInstance instance : instances) {
83	if (instance.isPersisted()) {	83	if (instance.isPersisted()) {
84	setEnabled(false);	84	setEnabled(false);
85	break;	85	break;
Lines 88-95 Link Here
88	}	88	}
89		89
90	public @Override void actionPerformed(ActionEvent e) {	90	public @Override void actionPerformed(ActionEvent e) {
91	for (HudsonInstanceImpl instance : instances) {	91	for (HudsonInstance instance : instances) {
92	instance.makePersistent();	92	Utilities.persistInstance(instance);
93	}	93	}
94	}	94	}
95		95

Lines 49-58 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/actions/ProjectAssociationAction.java (-8 / +7 lines)
49	import org.netbeans.api.project.ProjectUtils;	49	import org.netbeans.api.project.ProjectUtils;
50	import org.netbeans.api.project.ui.OpenProjects;	50	import org.netbeans.api.project.ui.OpenProjects;
51	import org.netbeans.modules.hudson.api.HudsonJob;	51	import org.netbeans.modules.hudson.api.HudsonJob;
52	import org.netbeans.modules.hudson.spi.ProjectHudsonProvider;	52	import org.netbeans.modules.hudson.ui.spi.ProjectHudsonProvider;
53	import org.openide.DialogDisplayer;	53	import org.openide.DialogDisplayer;
54	import org.openide.NotifyDescriptor;	54	import org.openide.NotifyDescriptor;
55	import static org.netbeans.modules.hudson.ui.actions.Bundle.*;
56	import org.openide.util.NbBundle.Messages;	55	import org.openide.util.NbBundle.Messages;
57		56
58	/**	57	/**
Lines 71-79 Link Here
71	assoc = ProjectHudsonProvider.Association.forJob(job);	70	assoc = ProjectHudsonProvider.Association.forJob(job);
72	this.alreadyAssociatedProject = ProjectHudsonProvider.getDefault().findAssociatedProject(assoc);	71	this.alreadyAssociatedProject = ProjectHudsonProvider.getDefault().findAssociatedProject(assoc);
73	if (alreadyAssociatedProject == null) {	72	if (alreadyAssociatedProject == null) {
74	putValue(NAME, ProjectAssociationAction_associate());	73	putValue(NAME, Bundle.ProjectAssociationAction_associate());
75	} else {	74	} else {
76	putValue(NAME, ProjectAssociationAction_dissociate(ProjectUtils.getInformation(alreadyAssociatedProject).getDisplayName()));	75	putValue(NAME, Bundle.ProjectAssociationAction_dissociate(ProjectUtils.getInformation(alreadyAssociatedProject).getDisplayName()));
77	}	76	}
78	}	77	}
79		78
Lines 88-107 Link Here
88	SortedSet<Project> projects = new TreeSet<Project>(ProjectRenderer.comparator());	87	SortedSet<Project> projects = new TreeSet<Project>(ProjectRenderer.comparator());
89	projects.addAll(Arrays.asList(OpenProjects.getDefault().getOpenProjects()));	88	projects.addAll(Arrays.asList(OpenProjects.getDefault().getOpenProjects()));
90	if (projects.isEmpty()) {	89	if (projects.isEmpty()) {
91	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(ProjectAssociationAction_open_some_projects(), NotifyDescriptor.INFORMATION_MESSAGE));	90	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(Bundle.ProjectAssociationAction_open_some_projects(), NotifyDescriptor.INFORMATION_MESSAGE));
92	return;	91	return;
93	}	92	}
94	JComboBox box = new JComboBox(new DefaultComboBoxModel(projects.toArray(new Project[projects.size()])));	93	JComboBox box = new JComboBox(new DefaultComboBoxModel(projects.toArray(new Project[projects.size()])));
95	box.setRenderer(new ProjectRenderer());	94	box.setRenderer(new ProjectRenderer());
96	if (DialogDisplayer.getDefault().notify(new NotifyDescriptor(box, ProjectAssociationAction_title_select_project(), NotifyDescriptor.OK_CANCEL_OPTION, NotifyDescriptor.PLAIN_MESSAGE, null, null)) != NotifyDescriptor.OK_OPTION) {	95	if (DialogDisplayer.getDefault().notify(new NotifyDescriptor(box, Bundle.ProjectAssociationAction_title_select_project(), NotifyDescriptor.OK_CANCEL_OPTION, NotifyDescriptor.PLAIN_MESSAGE, null, null)) != NotifyDescriptor.OK_OPTION) {
97	return;	96	return;
98	}	97	}
99	if (!ProjectHudsonProvider.getDefault().recordAssociation((Project) box.getSelectedItem(), assoc)) {	98	if (!ProjectHudsonProvider.getDefault().recordAssociation((Project) box.getSelectedItem(), assoc)) {
100	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(ProjectAssociationAction_could_not_associate(), NotifyDescriptor.WARNING_MESSAGE));	99	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(Bundle.ProjectAssociationAction_could_not_associate(), NotifyDescriptor.WARNING_MESSAGE));
101	}	100	}
102	} else {	101	} else {
103	if (!ProjectHudsonProvider.getDefault().recordAssociation(alreadyAssociatedProject, null)) {	102	if (!ProjectHudsonProvider.getDefault().recordAssociation(alreadyAssociatedProject, null)) {
104	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(ProjectAssociationAction_could_not_dissociate(), NotifyDescriptor.WARNING_MESSAGE));	103	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(Bundle.ProjectAssociationAction_could_not_dissociate(), NotifyDescriptor.WARNING_MESSAGE));
105	}	104	}
106	}	105	}
107	}	106	}

Lines 49-59 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/actions/ShowFailures.java (-41 / +26 lines)
49	import java.util.Set;	49	import java.util.Set;
50	import javax.swing.AbstractAction;	50	import javax.swing.AbstractAction;
51	import javax.swing.Action;	51	import javax.swing.Action;
52	import org.netbeans.modules.hudson.api.HudsonInstance;
53	import org.netbeans.modules.hudson.api.HudsonJobBuild;	52	import org.netbeans.modules.hudson.api.HudsonJobBuild;
54	import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;	53	import org.netbeans.modules.hudson.api.HudsonMavenModuleBuild;
55	import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;	54	import org.netbeans.modules.hudson.ui.impl.HudsonFailureDisplayer;
56	import org.netbeans.modules.hudson.spi.BuilderConnector;
57	import org.openide.util.ContextAwareAction;	55	import org.openide.util.ContextAwareAction;
58	import org.openide.util.Lookup;	56	import org.openide.util.Lookup;
59	import org.openide.util.NbBundle.Messages;	57	import org.openide.util.NbBundle.Messages;
Lines 93-119 Link Here
93	*/	91	*/
94	private boolean canShowFailures(HudsonJobBuild build,	92	private boolean canShowFailures(HudsonJobBuild build,
95	HudsonMavenModuleBuild module) {	93	HudsonMavenModuleBuild module) {
96	HudsonInstance instance = build.getJob().getInstance();	94
97	if (instance instanceof HudsonInstanceImpl) {	95	if (module == null && !HudsonJobBuild.Result.UNSTABLE.equals(
98	if (module == null && !HudsonJobBuild.Result.UNSTABLE.equals(	96	build.getResult())) {
99	build.getResult())) {	97	return false;
		98	} else if (module != null) {
		99	boolean failed = false;
		100	switch (module.getColor()) {
		101	case yellow:
		102	case yellow_anime:
		103	failed = true;
		104	}
		105	if (!failed) {
100	return false;	106	return false;
101	} else if (module != null) {
102	boolean failed = false;
103	switch (module.getColor()) {
104	case yellow:
105	case yellow_anime:
106	failed = true;
107	}
108	if (!failed) {
109	return false;
110	}
111	}	107	}
112	BuilderConnector builderClient =
113	((HudsonInstanceImpl) instance).getBuilderConnector();
114	return builderClient.getFailureDisplayer() != null;
115	}	108	}
116	return false;	109	return build.canShowFailures();
117	}	110	}
118		111
119	/**	112	/**
Lines 183-208 Link Here
183	if (!canShowFailures(build, moduleBuild)) {	176	if (!canShowFailures(build, moduleBuild)) {
184	return;	177	return;
185	}	178	}
186	HudsonInstance hudsonInstance = build.getJob().getInstance();	179	if (moduleBuild != null) {
187	if (hudsonInstance instanceof HudsonInstanceImpl) {	180	if (moduleBuild.canShowFailures()) {
188	HudsonInstanceImpl hudsonInstanceImpl =	181	moduleBuild.showFailures(new HudsonFailureDisplayer(moduleBuild));
189	(HudsonInstanceImpl) hudsonInstance;	182	}
190	BuilderConnector builderClient =	183	} else if (build.canShowFailures()) {
191	hudsonInstanceImpl.getBuilderConnector();	184	if (build.getMavenModules().isEmpty()) {
192	BuilderConnector.FailureDisplayer failureDisplayer =	185	build.showFailures(new HudsonFailureDisplayer(build));
193	builderClient.getFailureDisplayer();	186	} else {
194	if (failureDisplayer != null) {	187	for (HudsonMavenModuleBuild extraModule
195	if (moduleBuild != null) {	188	: getExtraModuleBuilds(build)) {
196	failureDisplayer.showFailures(moduleBuild);	189	extraModule.showFailures(
197	} else {	190	new HudsonFailureDisplayer(extraModule));
198	if (build.getMavenModules().isEmpty()) {
199	failureDisplayer.showFailures(build);
200	} else {
201	for (HudsonMavenModuleBuild extraModule
202	: getExtraModuleBuilds(build)) {
203	failureDisplayer.showFailures(extraModule);
204	}
205	}
206	}	191	}
207	}	192	}
208	}	193	}

Line 0 Link Here

(-)a/hudson.ui/src/org/netbeans/modules/hudson/ui/api/HudsonSCMHelper.java (+132 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2013 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 2013 Sun Microsystems, Inc.
		41	*/
		42
		43	package org.netbeans.modules.hudson.ui.api;
		44
		45	import java.awt.BorderLayout;
		46	import java.awt.EventQueue;
		47	import java.io.IOException;
		48	import java.util.logging.Level;
		49	import java.util.logging.Logger;
		50	import org.netbeans.api.diff.Diff;
		51	import org.netbeans.api.diff.DiffView;
		52	import org.netbeans.api.diff.StreamSource;
		53	import org.netbeans.modules.hudson.api.Utilities;
		54	import org.netbeans.modules.hudson.spi.HudsonSCM;
		55	import org.openide.awt.StatusDisplayer;
		56	import org.openide.util.NbBundle;
		57	import org.openide.windows.TopComponent;
		58	import org.w3c.dom.Document;
		59	import org.w3c.dom.Element;
		60
		61	/**
		62	* Convenience methods for SCM implementations.
		63	*/
		64	public class HudsonSCMHelper {
65	private static final Logger LOG = Logger.getLogger(HudsonSCM.class.getName());
66
67	private HudsonSCMHelper() {}
68
69	/**
70	* Add an SCM polling trigger.
71	* @param configXml a {@code config.xml}
72	*/
73	public static void addTrigger(Document configXml) {
74	Element root = configXml.getDocumentElement();
75	root.appendChild(configXml.createElement("triggers")). // NOI18N // XXX reuse existing <triggers> if found
76	appendChild(configXml.createElement("hudson.triggers.SCMTrigger")). // NOI18N
77	appendChild(configXml.createElement("spec")). // NOI18N
78	// XXX pretty arbitrary but seems like a decent first guess
79	appendChild(configXml.createTextNode("@hourly")); // NOI18N
80	}
81
82	@Deprecated
83	public static String xpath(String expr, Element xml) {
84	return Utilities.xpath(expr, xml);
85	}
86
87	/**
88	* Just notify the user that a diff will be shown for a given path.
89	* @param path a path, probably somehow repo-relative
90	*/
91	@NbBundle.Messages({"# {0} - portion of file path", "HudsonSCM.loading_diff=Loading diff for {0}..."})
92	public static void noteWillShowDiff(String path) {
93	StatusDisplayer.getDefault().setStatusText(Bundle.HudsonSCM_loading_diff(path));
94	}
95
96	/**
97	* Display a diff window for a file.
98	* @param before the former contents
99	* @param after the new contents
100	* @param path some representation of the file path
101	*/
102	@NbBundle.Messages({"# {0} - file basename", "HudsonSCM.diffing=Diffing {0}"})
103	public static void showDiff(final StreamSource before, final StreamSource after, final String path) {
104	EventQueue.invokeLater(new Runnable() {
105	@Override public void run() {
106	try {
107	DiffView view = Diff.getDefault().createDiff(before, after);
108	// XXX reuse the same TC
109	DiffTopComponent tc = new DiffTopComponent(view);
110	tc.setName(path);
111	tc.setDisplayName(Bundle.HudsonSCM_diffing(path.replaceFirst(".+/", ""))); //NOI18N
112	tc.open();
113	tc.requestActive();
114	} catch (IOException x) {
115	LOG.log(Level.INFO, null, x);
116	}
117	}
118	});
119	}
120	private static class DiffTopComponent extends TopComponent {
121	DiffTopComponent(DiffView view) {
122	setLayout(new BorderLayout());
123	add(view.getComponent(), BorderLayout.CENTER);
124	}
125	public @Override int getPersistenceType() {
126	return TopComponent.PERSISTENCE_NEVER;
127	}
128	protected @Override String preferredID() {
129	return "DiffTopComponent"; // NOI18N
130	}
131	}
132	}

Lines 45-50 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/nodes/HudsonInstanceNode.java (-8 / +84 lines)
45	package org.netbeans.modules.hudson.ui.nodes;	45	package org.netbeans.modules.hudson.ui.nodes;
46		46
47	import java.io.IOException;	47	import java.io.IOException;
		48	import java.lang.reflect.InvocationTargetException;
48	import java.util.ArrayList;	49	import java.util.ArrayList;
49	import java.util.Collections;	50	import java.util.Collections;
50	import java.util.LinkedList;	51	import java.util.LinkedList;
Lines 57-71 Link Here
57	import org.netbeans.modules.hudson.api.HudsonInstance;	58	import org.netbeans.modules.hudson.api.HudsonInstance;
58	import org.netbeans.modules.hudson.api.HudsonJob;	59	import org.netbeans.modules.hudson.api.HudsonJob;
59	import org.netbeans.modules.hudson.api.HudsonJob.Color;	60	import org.netbeans.modules.hudson.api.HudsonJob.Color;
		61	import org.netbeans.modules.hudson.api.HudsonManager;
60	import org.netbeans.modules.hudson.api.HudsonVersion;	62	import org.netbeans.modules.hudson.api.HudsonVersion;
61	import org.netbeans.modules.hudson.api.HudsonView;	63	import org.netbeans.modules.hudson.api.HudsonView;
62	import org.netbeans.modules.hudson.api.Utilities;	64	import org.netbeans.modules.hudson.api.Utilities;
63	import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
64	import org.netbeans.modules.hudson.impl.HudsonManagerImpl;
65	import static org.netbeans.modules.hudson.ui.nodes.Bundle.*;	65	import static org.netbeans.modules.hudson.ui.nodes.Bundle.*;
66	import org.openide.nodes.AbstractNode;	66	import org.openide.nodes.AbstractNode;
67	import org.openide.nodes.Children;	67	import org.openide.nodes.Children;
68	import org.openide.nodes.Node;	68	import org.openide.nodes.Node;
		69	import org.openide.nodes.PropertySupport;
		70	import org.openide.nodes.Sheet;
69	import org.openide.util.NbBundle.Messages;	71	import org.openide.util.NbBundle.Messages;
70	import org.openide.util.Union2;	72	import org.openide.util.Union2;
71	import org.openide.util.lookup.Lookups;	73	import org.openide.util.lookup.Lookups;
Lines 79-85 Link Here
79		81
80	private static final String ICON_BASE = "org/netbeans/modules/hudson/ui/resources/instance.png"; // NOI18N	82	private static final String ICON_BASE = "org/netbeans/modules/hudson/ui/resources/instance.png"; // NOI18N
81		83
82	private HudsonInstanceImpl instance;	84	private final HudsonInstance instance;
		85	private Sheet.Set set;
83		86
84	private boolean warn = false;	87	private boolean warn = false;
85	private boolean run = false;	88	private boolean run = false;
Lines 87-93 Link Here
87	private boolean forbidden;	90	private boolean forbidden;
88	private boolean version = false;	91	private boolean version = false;
89		92
90	public HudsonInstanceNode(final HudsonInstanceImpl instance) {	93	public HudsonInstanceNode(final HudsonInstance instance) {
91	super(new InstanceNodeChildren(instance), Lookups.singleton(instance));	94	super(new InstanceNodeChildren(instance), Lookups.singleton(instance));
92		95
93	setName(instance.getUrl());	96	setName(instance.getUrl());
Lines 156-168 Link Here
156	}	159	}
157		160
158	public @Override void destroy() throws IOException {	161	public @Override void destroy() throws IOException {
159	HudsonManagerImpl.getDefault().removeInstance(instance);	162	HudsonManager.removeInstance(instance);
160	}	163	}
161		164
162	public @Override PropertySet[] getPropertySets() {	165	public @Override PropertySet[] getPropertySets() {
163	return new PropertySet[] {instance.getProperties().getSheetSet()};	166	return new PropertySet[] {getSheetSet()};
164	}	167	}
165		168
		169	@Messages({
		170	"TXT_Instance_Prop_Name=Name",
		171	"DESC_Instance_Prop_Name=Hudson's instance name",
		172	"TXT_Instance_Prop_Url=URL",
		173	"DESC_Instance_Prop_Url=Hudson's instance URL",
		174	"TXT_Instance_Prop_Sync=Autosynchronization time",
		175	"DESC_Instance_Prop_Sync=Autosynchronization time in minutes (if it's 0 the autosynchronization is off)"
		176	})
		177	private Sheet.Set getSheetSet() {
		178	if (null == set) {
		179	set = Sheet.createPropertiesSet();
		180
		181	// Set display name
		182	set.setDisplayName(instance.getName());
		183
		184	// Put properties in
		185	set.put(new Node.Property<?>[]{
		186	new PropertySupport<String>("name", String.class, //NOI18N
		187	TXT_Instance_Prop_Name(),
		188	DESC_Instance_Prop_Name(),
		189	true, false) {
		190
		191	@Override
		192	public String getValue() {
		193	return instance.getName();
		194	}
		195
		196	@Override
		197	public void setValue(String val) {
		198	}
		199	},
		200	new PropertySupport<String>("url", String.class, //NOI18N
		201	TXT_Instance_Prop_Url(),
		202	DESC_Instance_Prop_Url(),
		203	true, false) {
		204
		205	@Override
		206	public String getValue() throws IllegalAccessException, InvocationTargetException {
		207	return instance.getUrl();
		208	}
		209
		210	@Override
		211	public void setValue(String val) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
		212	}
		213	},
		214	new PropertySupport<Integer>("sync", Integer.class, //NOI18N
		215	TXT_Instance_Prop_Sync(),
		216	DESC_Instance_Prop_Sync(),
		217	true, true) {
		218	@Override
		219	public Integer getValue() {
		220	return instance.getSyncInterval();
		221	}
		222
		223	@Override
		224	public void setValue(Integer val) {
		225	if (val == null \|\| val < 0) {
		226	throw new IllegalArgumentException();
		227	}
		228	instance.setSyncInterval(val);
		229	}
		230
		231	public @Override
		232	boolean canWrite() {
233	return instance.isPersisted();
234	}
235	}
236	});
237	}
238
239	return set;
240	}
241
166	private synchronized void refreshState() {	242	private synchronized void refreshState() {
167	alive = instance.isConnected();	243	alive = instance.isConnected();
168	forbidden = instance.isForbidden();	244	forbidden = instance.isForbidden();
Lines 200-208 Link Here
200		276
201	private static class InstanceNodeChildren extends Children.Keys<Union2<HudsonJob,HudsonFolder>> implements HudsonChangeListener {	277	private static class InstanceNodeChildren extends Children.Keys<Union2<HudsonJob,HudsonFolder>> implements HudsonChangeListener {
202		278
203	private final HudsonInstanceImpl instance;	279	private final HudsonInstance instance;
204		280
205	InstanceNodeChildren(HudsonInstanceImpl instance) {	281	InstanceNodeChildren(HudsonInstance instance) {
206	this.instance = instance;	282	this.instance = instance;
207	instance.addHudsonChangeListener(this);	283	instance.addHudsonChangeListener(this);
208	instance.prefs().addPreferenceChangeListener(new PreferenceChangeListener() {	284	instance.prefs().addPreferenceChangeListener(new PreferenceChangeListener() {

Lines 47-73 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/nodes/HudsonJobNode.java (-20 / +84 lines)
47	import java.beans.PropertyChangeEvent;	47	import java.beans.PropertyChangeEvent;
48	import java.beans.PropertyChangeListener;	48	import java.beans.PropertyChangeListener;
49	import java.io.CharConversionException;	49	import java.io.CharConversionException;
		50	import java.lang.reflect.InvocationTargetException;
50	import java.util.ArrayList;	51	import java.util.ArrayList;
51	import java.util.List;	52	import java.util.List;
52	import javax.swing.Action;	53	import javax.swing.Action;
53	import org.netbeans.modules.hudson.api.HudsonJob;	54	import org.netbeans.modules.hudson.api.HudsonJob;
54	import org.netbeans.modules.hudson.api.HudsonJob.Color;	55	import org.netbeans.modules.hudson.api.HudsonJob.Color;
55	import org.netbeans.modules.hudson.api.HudsonJobBuild;	56	import org.netbeans.modules.hudson.api.HudsonJobBuild;
56	import org.netbeans.modules.hudson.constants.HudsonInstanceConstants;
57	import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
58	import org.netbeans.modules.hudson.impl.HudsonJobImpl;
59	import org.netbeans.modules.hudson.ui.actions.LogInAction;	57	import org.netbeans.modules.hudson.ui.actions.LogInAction;
60	import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;	58	import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;
61	import org.netbeans.modules.hudson.ui.actions.ProjectAssociationAction;
62	import org.netbeans.modules.hudson.ui.actions.StartJobAction;	59	import org.netbeans.modules.hudson.ui.actions.StartJobAction;
63	import org.netbeans.modules.hudson.ui.actions.ViewConfigAction;	60	import org.netbeans.modules.hudson.ui.actions.ViewConfigAction;
64	import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;	61	import org.netbeans.modules.hudson.api.ui.OpenableInBrowser;
		62	import org.netbeans.modules.hudson.constants.HudsonInstanceConstants;
		63	import org.netbeans.modules.hudson.constants.HudsonJobConstants;
		64	import org.netbeans.modules.hudson.ui.actions.ProjectAssociationAction;
65	import static org.netbeans.modules.hudson.ui.nodes.Bundle.*;	65	import static org.netbeans.modules.hudson.ui.nodes.Bundle.*;
66	import org.openide.actions.PropertiesAction;	66	import org.openide.actions.PropertiesAction;
67	import org.openide.nodes.AbstractNode;	67	import org.openide.nodes.AbstractNode;
68	import org.openide.nodes.ChildFactory;	68	import org.openide.nodes.ChildFactory;
69	import org.openide.nodes.Children;	69	import org.openide.nodes.Children;
70	import org.openide.nodes.Node;	70	import org.openide.nodes.Node;
		71	import org.openide.nodes.PropertySupport;
71	import org.openide.nodes.Sheet;	72	import org.openide.nodes.Sheet;
72	import org.openide.util.NbBundle.Messages;	73	import org.openide.util.NbBundle.Messages;
73	import org.openide.util.WeakListeners;	74	import org.openide.util.WeakListeners;
Lines 85-90 Link Here
85	private String htmlDisplayName;	86	private String htmlDisplayName;
86	private HudsonJob job;	87	private HudsonJob job;
87	private PropertyChangeListener watchedListener;	88	private PropertyChangeListener watchedListener;
		89	private Sheet.Set set;
88		90
89	public HudsonJobNode(HudsonJob job) {	91	public HudsonJobNode(HudsonJob job) {
90	super(makeChildren(job), Lookups.singleton(job));	92	super(makeChildren(job), Lookups.singleton(job));
Lines 128-134 Link Here
128	@Override	130	@Override
129	public Action[] getActions(boolean context) {	131	public Action[] getActions(boolean context) {
130	if (job.getColor() == Color.secured) {	132	if (job.getColor() == Color.secured) {
131	return new Action[] {new LogInAction((HudsonInstanceImpl) job.getInstance())};	133	return new Action[] {new LogInAction(job.getInstance())};
132	}	134	}
133	List<Action> actions = new ArrayList<Action>();	135	List<Action> actions = new ArrayList<Action>();
134	actions.add(SystemAction.get(StartJobAction.class));	136	actions.add(SystemAction.get(StartJobAction.class));
Lines 148-174 Link Here
148	Sheet s = super.createSheet();	150	Sheet s = super.createSheet();
149		151
150	// Put properties in	152	// Put properties in
151	s.put(((HudsonJobImpl) job).getSheetSet()); // XXX is cast necessary?	153	s.put(getSheetSet()); // XXX is cast necessary?
152		154
153	return s;	155	return s;
154	}	156	}
155		157
156	private void setWatchedListener() {	158	@Messages({
157	if (job instanceof HudsonJobImpl) {	159	"TXT_Job_Prop_Name=Name",
158	final HudsonJobImpl jobImpl = (HudsonJobImpl) job;	160	"DESC_Job_Prop_Name=Hudson's job name",
159	watchedListener = new PropertyChangeListener() {	161	"TXT_Job_Prop_Url=URL",
160	@Override	162	"DESC_Job_Prop_Url=Hudson's job URL",
161	public void propertyChange(PropertyChangeEvent evt) {	163	"HudsonJobImpl.watched=Watched",
162	if (evt.getPropertyName().equals(	164	"HudsonJobImpl.watched_desc=Whether you wish to be notified of failures in this job."
163	HudsonInstanceConstants.INSTANCE_SUPPRESSED_JOBS)) {	165	})
164	setHudsonJob(HudsonJobNode.this.job);	166	private Sheet.Set getSheetSet() {
		167	if (null == set) {
		168	set = Sheet.createPropertiesSet();
		169
		170	// Set display name
		171	set.setDisplayName(getDisplayName());
		172
		173	// Put properties in
		174	set.put(new Node.Property<?>[]{
		175	new PropertySupport<String>(HudsonJobConstants.JOB_NAME, String.class,
		176	TXT_Job_Prop_Name(),
		177	DESC_Job_Prop_Name(), true, false) {
		178
		179	@Override
		180	public String getValue() {
		181	return job.getName();
		182	}
		183
		184	@Override
		185	public void setValue(String val) {
		186	}
		187	},
		188	new PropertySupport<String>(HudsonJobConstants.JOB_URL, String.class,
		189	TXT_Job_Prop_Url(),
		190	DESC_Job_Prop_Url(), true, false) {
		191
		192	@Override
		193	public String getValue() throws IllegalAccessException, InvocationTargetException {
		194	return job.getUrl();
		195	}
		196
		197	@Override
		198	public void setValue(String val) {
		199	}
		200
		201	},
		202	new PropertySupport.ReadWrite<Boolean>("salient", Boolean.TYPE, // NOI18N
		203	HudsonJobImpl_watched(),
		204	HudsonJobImpl_watched_desc()) {
		205	@Override
		206	public Boolean getValue() {
		207	return job.isSalient();
		208	}
		209
		210	@Override
		211	public void setValue(Boolean val) {
		212	if (!getValue().equals(val)) {
		213	job.setSalient(val);
		214	}
165	}	215	}
166	}	216	}
167	};	217	});
168	jobImpl.getInstance().getProperties().addPropertyChangeListener(
169	WeakListeners.propertyChange(watchedListener,
170	jobImpl.getInstance().getProperties()));
171	}	218	}
		219	return set;
		220	}
		221
		222	private void setWatchedListener() {
		223
		224	watchedListener = new PropertyChangeListener() {
		225	@Override
		226	public void propertyChange(PropertyChangeEvent evt) {
		227	if (evt.getPropertyName().equals(
		228	HudsonInstanceConstants.INSTANCE_SUPPRESSED_JOBS)) {
		229	setHudsonJob(HudsonJobNode.this.job);
		230	}
		231	}
		232	};
		233	job.getInstance().addPropertyChangeListener(
		234	WeakListeners.propertyChange(watchedListener,
		235	job.getInstance()));
172	}	236	}
173		237
174	@Messages({	238	@Messages({

Lines 56-66 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/wizard/InstanceDialog.java (-4 / +4 lines)
56	import javax.swing.JButton;	56	import javax.swing.JButton;
57	import org.netbeans.modules.hudson.api.ConnectionBuilder;	57	import org.netbeans.modules.hudson.api.ConnectionBuilder;
58	import org.netbeans.modules.hudson.api.HudsonInstance;	58	import org.netbeans.modules.hudson.api.HudsonInstance;
		59	import org.netbeans.modules.hudson.api.HudsonManager;
59	import org.netbeans.modules.hudson.api.HudsonVersion;	60	import org.netbeans.modules.hudson.api.HudsonVersion;
60	import org.netbeans.modules.hudson.api.UI;
61	import org.netbeans.modules.hudson.impl.HudsonInstanceImpl;
62	import org.netbeans.modules.hudson.api.Utilities;	61	import org.netbeans.modules.hudson.api.Utilities;
63	import org.netbeans.modules.hudson.util.UsageLogging;	62	import org.netbeans.modules.hudson.ui.api.UI;
		63	import org.netbeans.modules.hudson.ui.util.UsageLogging;
64	import org.openide.DialogDescriptor;	64	import org.openide.DialogDescriptor;
65	import org.openide.DialogDisplayer;	65	import org.openide.DialogDisplayer;
66	import org.openide.NotifyDescriptor;	66	import org.openide.NotifyDescriptor;
Lines 138-144 Link Here
138	problem(NbBundle.getMessage(InstanceDialog.class, "MSG_FailedToConnect"));	138	problem(NbBundle.getMessage(InstanceDialog.class, "MSG_FailedToConnect"));
139	return;	139	return;
140	}	140	}
141	created = HudsonInstanceImpl.createHudsonInstance(panel.getDisplayName(), panel.getUrl(), String.valueOf(panel.getSyncTime()));	141	created = HudsonManager.addInstance(panel.getDisplayName(), panel.getUrl(), panel.getSyncTime(), true);
142	EventQueue.invokeLater(new Runnable() {	142	EventQueue.invokeLater(new Runnable() {
143	public void run() {	143	public void run() {
144	dialog.dispose();	144	dialog.dispose();

Lines 51-57 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/wizard/InstancePropertiesVisual.java (-3 / +3 lines)
51	import javax.swing.event.DocumentEvent;	51	import javax.swing.event.DocumentEvent;
52	import javax.swing.event.DocumentListener;	52	import javax.swing.event.DocumentListener;
53	import org.netbeans.api.options.OptionsDisplayer;	53	import org.netbeans.api.options.OptionsDisplayer;
54	import org.netbeans.modules.hudson.impl.HudsonManagerImpl;	54	import org.netbeans.modules.hudson.api.HudsonManager;
55	import org.openide.NotificationLineSupport;	55	import org.openide.NotificationLineSupport;
56	import org.openide.util.NbBundle;	56	import org.openide.util.NbBundle;
57		57
Lines 257-263 Link Here
257	msgs.setInformationMessage(NbBundle.getMessage(InstanceDialog.class, "MSG_EmptyName"));	257	msgs.setInformationMessage(NbBundle.getMessage(InstanceDialog.class, "MSG_EmptyName"));
258	return;	258	return;
259	}	259	}
260	if (HudsonManagerImpl.getDefault().getInstanceByName(name) != null) {	260	if (HudsonManager.getInstanceByName(name) != null) {
261	msgs.setErrorMessage(NbBundle.getMessage(InstanceDialog.class, "MSG_ExistName"));	261	msgs.setErrorMessage(NbBundle.getMessage(InstanceDialog.class, "MSG_ExistName"));
262	return;	262	return;
263	}	263	}
Lines 279-285 Link Here
279	msgs.setErrorMessage(x.getLocalizedMessage());	279	msgs.setErrorMessage(x.getLocalizedMessage());
280	return;	280	return;
281	}	281	}
282	if (HudsonManagerImpl.getDefault().getInstance(url) != null) {	282	if (HudsonManager.getInstance(url) != null) {
283	msgs.setErrorMessage(NbBundle.getMessage(InstanceDialog.class, "MSG_ExistUrl"));	283	msgs.setErrorMessage(NbBundle.getMessage(InstanceDialog.class, "MSG_ExistUrl"));
284	return;	284	return;
285	}	285	}

Lines 33-47 Link Here

(-)a/hudson/nbproject/project.xml (-78 / +3 lines)
33	</run-dependency>	33	</run-dependency>
34	</dependency>	34	</dependency>
35	<dependency>	35	<dependency>
36	<code-name-base>org.netbeans.core.ide</code-name-base>
37	<build-prerequisite/>
38	<compile-dependency/>
39	<run-dependency>
40	<release-version>1</release-version>
41	<specification-version>1.15</specification-version>
42	</run-dependency>
43	</dependency>
44	<dependency>
45	<code-name-base>org.netbeans.libs.commons_net</code-name-base>	36	<code-name-base>org.netbeans.libs.commons_net</code-name-base>
46	<build-prerequisite/>	37	<build-prerequisite/>
47	<compile-dependency/>	38	<compile-dependency/>
Lines 51-74 Link Here
51	</run-dependency>	42	</run-dependency>
52	</dependency>	43	</dependency>
53	<dependency>	44	<dependency>
54	<code-name-base>org.netbeans.modules.diff</code-name-base>
55	<build-prerequisite/>
56	<compile-dependency/>
57	<run-dependency>
58	<release-version>1</release-version>
59	<specification-version>1.21</specification-version>
60	</run-dependency>
61	</dependency>
62	<dependency>
63	<code-name-base>org.netbeans.modules.gsf.testrunner</code-name-base>
64	<build-prerequisite/>
65	<compile-dependency/>
66	<run-dependency>
67	<release-version>1</release-version>
68	<specification-version>1.26</specification-version>
69	</run-dependency>
70	</dependency>
71	<dependency>
72	<code-name-base>org.netbeans.modules.keyring</code-name-base>	45	<code-name-base>org.netbeans.modules.keyring</code-name-base>
73	<build-prerequisite/>	46	<build-prerequisite/>
74	<compile-dependency/>	47	<compile-dependency/>
Lines 77-117 Link Here
77	</run-dependency>	50	</run-dependency>
78	</dependency>	51	</dependency>
79	<dependency>	52	<dependency>
80	<code-name-base>org.netbeans.modules.options.api</code-name-base>
81	<build-prerequisite/>
82	<compile-dependency/>
83	<run-dependency>
84	<release-version>1</release-version>
85	<specification-version>1.5</specification-version>
86	</run-dependency>
87	</dependency>
88	<dependency>
89	<code-name-base>org.netbeans.modules.projectapi</code-name-base>
90	<build-prerequisite/>
91	<compile-dependency/>
92	<run-dependency>
93	<release-version>1</release-version>
94	<specification-version>1.16</specification-version>
95	</run-dependency>
96	</dependency>
97	<dependency>
98	<code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
99	<build-prerequisite/>
100	<compile-dependency/>
101	<run-dependency>
102	<release-version>1</release-version>
103	<specification-version>1.23.0.6</specification-version>
104	</run-dependency>
105	</dependency>
106	<dependency>
107	<code-name-base>org.netbeans.spi.quicksearch</code-name-base>
108	<build-prerequisite/>
109	<compile-dependency/>
110	<run-dependency>
111	<specification-version>1.13</specification-version>
112	</run-dependency>
113	</dependency>
114	<dependency>
115	<code-name-base>org.openide.actions</code-name-base>	53	<code-name-base>org.openide.actions</code-name-base>
116	<build-prerequisite/>	54	<build-prerequisite/>
117	<compile-dependency/>	55	<compile-dependency/>
Lines 136-149 Link Here
136	</run-dependency>	74	</run-dependency>
137	</dependency>	75	</dependency>
138	<dependency>	76	<dependency>
139	<code-name-base>org.openide.explorer</code-name-base>
140	<build-prerequisite/>
141	<compile-dependency/>
142	<run-dependency>
143	<specification-version>6.18</specification-version>
144	</run-dependency>
145	</dependency>
146	<dependency>
147	<code-name-base>org.openide.filesystems</code-name-base>	77	<code-name-base>org.openide.filesystems</code-name-base>
148	<build-prerequisite/>	78	<build-prerequisite/>
149	<compile-dependency/>	79	<compile-dependency/>
Lines 176-189 Link Here
176	</run-dependency>	106	</run-dependency>
177	</dependency>	107	</dependency>
178	<dependency>	108	<dependency>
179	<code-name-base>org.openide.nodes</code-name-base>
180	<build-prerequisite/>
181	<compile-dependency/>
182	<run-dependency>
183	<specification-version>7.27</specification-version>
184	</run-dependency>
185	</dependency>
186	<dependency>
187	<code-name-base>org.openide.text</code-name-base>	109	<code-name-base>org.openide.text</code-name-base>
188	<build-prerequisite/>	110	<build-prerequisite/>
189	<compile-dependency/>	111	<compile-dependency/>
Lines 239-246 Link Here
239	<friend>org.netbeans.modules.hudson.php</friend>	161	<friend>org.netbeans.modules.hudson.php</friend>
240	<friend>org.netbeans.modules.hudson.subversion</friend>	162	<friend>org.netbeans.modules.hudson.subversion</friend>
241	<friend>org.netbeans.modules.hudson.tasklist</friend>	163	<friend>org.netbeans.modules.hudson.tasklist</friend>
		164	<friend>org.netbeans.modules.hudson.ui</friend>
242	<friend>org.netbeans.modules.odcs.hudson</friend>	165	<friend>org.netbeans.modules.odcs.hudson</friend>
243	<package>org.netbeans.modules.hudson.api</package>	166	<package>org.netbeans.modules.hudson.api</package>
		167	<package>org.netbeans.modules.hudson.api.ui</package>
		168	<package>org.netbeans.modules.hudson.constants</package>
244	<package>org.netbeans.modules.hudson.spi</package>	169	<package>org.netbeans.modules.hudson.spi</package>
245	</friend-packages>	170	</friend-packages>
246	</data>	171	</data>

Lines 93-102 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/impl/HudsonConnector.java (-6 / +6 lines)
93	*/	93	*/
94	public class HudsonConnector extends BuilderConnector {	94	public class HudsonConnector extends BuilderConnector {
95	private static final Logger LOG = Logger.getLogger(HudsonConnector.class.getName());	95	private static final Logger LOG = Logger.getLogger(HudsonConnector.class.getName());
96	public static final HudsonFailureDisplayer HUDSON_FAILURE_DISPLAYER =	96	public static final HudsonFailureDataProvider HUDSON_FAILURE_DISPLAYER =
97	new HudsonFailureDisplayer();	97	new HudsonFailureDataProvider();
98	public static final HudsonConsoleDisplayer HUDSON_CONSOLE_DISPLAYER =	98	public static final HudsonConsoleDataProvider HUDSON_CONSOLE_DISPLAYER =
99	new HudsonConsoleDisplayer();	99	new HudsonConsoleDataProvider();
100		100
101	private HudsonVersion version;	101	private HudsonVersion version;
102	private boolean connected = false;	102	private boolean connected = false;
Lines 567-578 Link Here
567	}	567	}
568		568
569	@Override	569	@Override
570	public ConsoleDisplayer getConsoleDisplayer() {	570	public ConsoleDataProvider getConsoleDataProvider() {
571	return HUDSON_CONSOLE_DISPLAYER;	571	return HUDSON_CONSOLE_DISPLAYER;
572	}	572	}
573		573
574	@Override	574	@Override
575	public FailureDisplayer getFailureDisplayer() {	575	public FailureDataProvider getFailureDataProvider() {
576	return HUDSON_FAILURE_DISPLAYER;	576	return HUDSON_FAILURE_DISPLAYER;
577	}	577	}
578		578

Lines 1-108 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/impl/ProjectHIP.java (-108 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	*
29	* The Original Software is NetBeans. The Initial Developer of the Original
30	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
31	* Microsystems, Inc. All Rights Reserved.
32	*
33	* If you wish your version of this file to be governed by only the CDDL
34	* or only the GPL Version 2, indicate your decision by adding
35	* "[Contributor] elects to include this software in this distribution
36	* under the [CDDL or GPL Version 2] license." If you do not indicate a
37	* single choice of license, a recipient has the option to distribute
38	* your version of this file under either the CDDL, the GPL Version 2 or
39	* to extend the choice of license to its licensees as provided above.
40	* However, if you add GPL Version 2 code and therefore, elected the GPL
41	* Version 2 license, then the option applies only if the new code is
42	* made subject to such option by the copyright holder.
43	*/
44
45	package org.netbeans.modules.hudson.impl;
46
47	import java.util.ArrayList;
48	import java.util.HashSet;
49	import java.util.List;
50	import java.util.Set;
51	import org.netbeans.api.project.Project;
52	import static org.netbeans.modules.hudson.constants.HudsonInstanceConstants.*;
53	import org.netbeans.modules.hudson.spi.ProjectHudsonProvider;
54
55	/**
56	*
57	* @author mkleint
58	*/
59	class ProjectHIP extends HudsonInstanceProperties {
60
61	private final Set<Project> providers = new HashSet<Project>();
62	public ProjectHIP() {
63	super("", "", "60"); // NOI18N
64	put(INSTANCE_PERSISTED, FALSE);
65	}
66
67	public void addProvider(Project prov) {
68	synchronized (providers) {
69	providers.add(prov);
70	}
71	ProjectHudsonProvider.Association assoc = ProjectHudsonProvider.getDefault().findAssociation(prov);
72	if (assoc != null) {
73	String u = assoc.getServerUrl();
74	put(INSTANCE_URL, u);
75	put(INSTANCE_NAME, HudsonManagerImpl.simplifyServerLocation(u, false));
76	setPreferredJobs();
77	}
78	//TODO listen on changes from the provider and refire them as changed properties.
79	}
80
81	public void removeProvider(Project prov) {
82	synchronized (providers) {
83	providers.remove(prov);
84	}
85	setPreferredJobs();
86	}
87
88	public Set<Project> getProviders() {
89	synchronized (providers) {
90	return new HashSet<Project>(providers);
91	}
92	}
93
94	private void setPreferredJobs() {
95	List<String> names = new ArrayList<String>();
96	for (Project prj : getProviders()) {
97	ProjectHudsonProvider.Association assoc = ProjectHudsonProvider.getDefault().findAssociation(prj);
98	if (assoc != null) {
99	String name = assoc.getJobName();
100	if (name != null) {
101	names.add(name);
102	}
103	}
104	}
105	put(INSTANCE_PREF_JOBS, join(names));
106	}
107
108	}

Lines 151-176 Link Here

(-)a/odcs.hudson/test/unit/src/org/netbeans/modules/odcs/hudson/ODCSBuilderAccessorTest.java (-27 / +7 lines)
151	}	151	}
152		152
153	/**	153	/**
154	* Check that mock instances work as expected.
155	*/
156	@Test
157	public void testMocks() throws ODCSException, MalformedURLException,
158	MalformedURLException {
159
160	ODCSClient client = ODCSFactory.getInstance().createClient(
161	"http://test/", new PasswordAuthentication(
162	"mockUser", "password".toCharArray()));
163	assertNotNull(client);
164	Project project = client.getProjectById("mockProject");
165	assertEquals("Mock Test Project", project.getDescription());
166
167	ProjectHandle<ODCSProject> handle = TestUtils.createMockHandle(
168	"http://test/", "mockProject");
169	assertNotNull(handle);
170	assertEquals("Mock Project", handle.getDisplayName());
171	}
172
173	/**
174	* Check that the job handle for mock job has correct name.	154	* Check that the job handle for mock job has correct name.
175	*/	155	*/
176	@Test	156	@Test
Lines 430-448 Link Here
430	}	410	}
431		411
432	@Override	412	@Override
433	public ConsoleDisplayer getConsoleDisplayer() {	413	public Collection<? extends HudsonJobChangeItem> getJobBuildChanges(HudsonJobBuild build) {
		414	return Collections.emptyList();
		415	}
		416
		417	@Override
		418	public ConsoleDataProvider getConsoleDataProvider() {
434	return null;	419	return null;
435	}	420	}
436		421
437	@Override	422	@Override
438	public FailureDisplayer getFailureDisplayer() {	423	public FailureDataProvider getFailureDataProvider() {
439	return null;	424	return null;
440	}	425	}
441
442	@Override
443	public Collection<? extends HudsonJobChangeItem> getJobBuildChanges(HudsonJobBuild build) {
444	return Collections.emptyList();
445	}
446	}	426	}
447		427
448	/**	428	/**