This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 3b694ec5d4 Renamed Hudson to Jenkins
new 7cda5ed3c3 Merge pull request #6797 from rothardo/hudsontojenkins
3b694ec5d4 is described below
commit 3b694ec5d4223a8880f703795be36606e893dd72
Author: Ashwin Temkar <[email protected]>
AuthorDate: Wed Dec 6 13:27:51 2023 +0530
Renamed Hudson to Jenkins
---
.../netbeans/modules/hudson/git/Bundle.properties | 2 +-
.../netbeans/modules/hudson/git/HudsonGitSCM.java | 4 +-
.../modules/hudson/mercurial/Bundle.properties | 2 +-
.../hudson/mercurial/HudsonMercurialSCM.java | 2 +-
.../modules/hudson/subversion/Bundle.properties | 2 +-
.../modules/hudson/tasklist/Bundle.properties | 2 +-
.../modules/hudson/tasklist/HudsonScanner.java | 4 +-
ide/hudson.ui/licenseinfo.xml | 8 +-
.../netbeans/modules/hudson/ui/Bundle.properties | 4 +-
.../org/netbeans/modules/hudson/ui/FormLogin.java | 2 +-
.../hudson/ui/actions/AddInstanceAction.java | 2 +-
.../hudson/ui/actions/AddTestInstanceAction.java | 6 +-
.../modules/hudson/ui/actions/Bundle.properties | 6 +-
.../modules/hudson/ui/actions/CreateJob.java | 4 +-
.../ui/actions/ProjectAssociationAction.java | 4 +-
.../modules/hudson/ui/impl/SearchProviderImpl.java | 2 +-
.../hudson/ui/nodes/HudsonInstanceNode.java | 4 +-
.../modules/hudson/ui/nodes/HudsonJobNode.java | 4 +-
.../modules/hudson/ui/nodes/HudsonRootNode.java | 6 +-
.../ui/notification/ProblemNotification.java | 2 +-
.../modules/hudson/ui/resources/instance.png | Bin 758 -> 794 bytes
.../modules/hudson/ui/wizard/Bundle.properties | 10 +-
.../modules/hudson/ui/wizard/InstanceDialog.java | 6 +-
.../org/netbeans/modules/hudson/Bundle.properties | 7 +-
.../netbeans/modules/hudson/api/HudsonFolder.java | 2 +-
.../org/netbeans/modules/hudson/api/HudsonJob.java | 6 +-
.../modules/hudson/impl/HudsonManagerImplTest.java | 4 +-
nbbuild/licenses/CC-BY-SA-3.0 | 359 +++++++++++++++++++++
.../modules/hudson/php/HudsonJobCreator.java | 6 +-
.../modules/hudson/php/resources/Bundle.properties | 4 +-
.../hudson/php/ui/options/Bundle.properties | 2 +-
.../hudson/php/ui/options/HudsonOptionsPanel.java | 2 +-
32 files changed, 422 insertions(+), 58 deletions(-)
diff --git
a/ide/hudson.git/src/org/netbeans/modules/hudson/git/Bundle.properties
b/ide/hudson.git/src/org/netbeans/modules/hudson/git/Bundle.properties
index d89c2ba934..251821660c 100644
--- a/ide/hudson.git/src/org/netbeans/modules/hudson/git/Bundle.properties
+++ b/ide/hudson.git/src/org/netbeans/modules/hudson/git/Bundle.properties
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-OpenIDE-Module-Name=Hudson Git Bindings
+OpenIDE-Module-Name=Jenkins Git Bindings
diff --git
a/ide/hudson.git/src/org/netbeans/modules/hudson/git/HudsonGitSCM.java
b/ide/hudson.git/src/org/netbeans/modules/hudson/git/HudsonGitSCM.java
index 280d54ace6..4b272491cc 100644
--- a/ide/hudson.git/src/org/netbeans/modules/hudson/git/HudsonGitSCM.java
+++ b/ide/hudson.git/src/org/netbeans/modules/hudson/git/HudsonGitSCM.java
@@ -60,8 +60,8 @@ public class HudsonGitSCM implements HudsonSCM {
private static final Logger LOG =
Logger.getLogger(HudsonGitSCM.class.getName());
@Messages({
- "# {0} - original URL", "# {1} - replacement URL",
"ro_replacement=Replacing {0} with {1} in Hudson configuration.",
- "# {0} - repository location", "warning.local_repo={0} will only be
accessible from a Hudson server on the same machine."
+ "# {0} - original URL", "# {1} - replacement URL",
"ro_replacement=Replacing {0} with {1} in Jenkins configuration.",
+ "# {0} - repository location", "warning.local_repo={0} will only be
accessible from a Jenkins server on the same machine."
})
@Override public Configuration forFolder(File folder) {
if (!new File(folder, ".git").isDirectory()) {
diff --git
a/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/Bundle.properties
b/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/Bundle.properties
index b66bc4fd8e..f7867085be 100644
---
a/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/Bundle.properties
+++
b/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/Bundle.properties
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-OpenIDE-Module-Name=Hudson Mercurial Bindings
+OpenIDE-Module-Name=Jenkins Mercurial Bindings
diff --git
a/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java
b/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java
index fb0fc51669..be5b6d0420 100644
---
a/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java
+++
b/ide/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java
@@ -61,7 +61,7 @@ public class HudsonMercurialSCM implements HudsonSCM {
@Messages({
"# {0} - repository location",
- "warning.local_repo={0} will only be accessible from a Hudson server
on the same machine.",
+ "warning.local_repo={0} will only be accessible from a Jenkins server
on the same machine.",
"error.repo.in.parent=Cannot find repository metadata in the project
folder. Please configure the build manually."
})
public Configuration forFolder(File folder) {
diff --git
a/ide/hudson.subversion/src/org/netbeans/modules/hudson/subversion/Bundle.properties
b/ide/hudson.subversion/src/org/netbeans/modules/hudson/subversion/Bundle.properties
index e1f1ec0ef3..6b5550150e 100644
---
a/ide/hudson.subversion/src/org/netbeans/modules/hudson/subversion/Bundle.properties
+++
b/ide/hudson.subversion/src/org/netbeans/modules/hudson/subversion/Bundle.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-OpenIDE-Module-Name=Hudson Subversion Bindings
+OpenIDE-Module-Name=Jenkins Subversion Bindings
# {0} - file basename
# {1} - revision number
SubversionHyperlink.title={0} #{1,number,#}
diff --git
a/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/Bundle.properties
b/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/Bundle.properties
index 064df5de00..dde1f9d2f2 100644
---
a/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/Bundle.properties
+++
b/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/Bundle.properties
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-OpenIDE-Module-Name=Hudson Action Items
+OpenIDE-Module-Name=Jenkins Action Items
diff --git
a/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/HudsonScanner.java
b/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/HudsonScanner.java
index 5fd4c32bd8..0badf50a0f 100644
---
a/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/HudsonScanner.java
+++
b/ide/hudson.tasklist/src/org/netbeans/modules/hudson/tasklist/HudsonScanner.java
@@ -58,8 +58,8 @@ public class HudsonScanner extends PushTaskScanner implements
Runnable {
private final Map<Project,CacheEntry> cache = new
WeakHashMap<Project,CacheEntry>();
@Messages({
- "HudsonScanner.displayName=Hudson Warnings",
- "HudsonScanner.description=Warnings and other action items coming from
Hudson servers, currently supporting the Static Analysis plugin suite."
+ "HudsonScanner.displayName=Jenkins Warnings",
+ "HudsonScanner.description=Warnings and other action items coming from
Jenkins servers, currently supporting the Static Analysis plugin suite."
})
public HudsonScanner() {
super(HudsonScanner_displayName(), HudsonScanner_description(), null);
diff --git a/ide/hudson.ui/licenseinfo.xml b/ide/hudson.ui/licenseinfo.xml
index b8d74298ad..4a6017dea2 100644
--- a/ide/hudson.ui/licenseinfo.xml
+++ b/ide/hudson.ui/licenseinfo.xml
@@ -23,8 +23,14 @@
<fileset>
<file>src/org/netbeans/modules/hudson/ui/resources/notification.png</file>
<file>src/org/netbeans/modules/hudson/ui/resources/hudson.png</file>
- <file>src/org/netbeans/modules/hudson/ui/resources/instance.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
+ <fileset>
+ <file>src/org/netbeans/modules/hudson/ui/resources/instance.png</file>
+ <license ref="CC-BY-SA-3.0" />
+ <notice>Original image from the Jenkins project (https://jenkins.io/):
+https://github.com/jenkins-infra/jenkins.io/blob/master/content/images/logos/jenkins/jenkins.svg
+(placed on square background, rendered to 16x16px with inkscape)</notice>
+ </fileset>
</licenseinfo>
diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/Bundle.properties
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/Bundle.properties
index e3c6ce1a21..439980d245 100644
--- a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/Bundle.properties
+++ b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/Bundle.properties
@@ -16,7 +16,7 @@
# under the License.
OpenIDE-Module-Display-Category=Base IDE
-OpenIDE-Module-Name=Hudson UI
+OpenIDE-Module-Name=Jenkins UI
FormLogin.locationLabel.text=&Server:
FormLogin.userLabel.text=&Username:
@@ -25,4 +25,4 @@ APITokenConnectionAuthenticator.userLabel.text=&Username:
APITokenConnectionAuthenticator.locationLabel.text=&Server:
APITokenConnectionAuthenticator.tokLabel.text=API &Token:
APITokenConnectionAuthenticator.tokButton.text=&Find...
-OpenIDE-Module-Short-Description=User Interface and IDE integration for Hudson
Support
+OpenIDE-Module-Short-Description=User Interface and IDE integration for
Jenkins Support
diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/FormLogin.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/FormLogin.java
index 3019d923d5..58ab159632 100644
--- a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/FormLogin.java
+++ b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/FormLogin.java
@@ -49,7 +49,7 @@ public class FormLogin extends JPanel {
public static class AuthImpl implements PasswordAuthorizer {
@Messages({
- "FormLogin.log_in=Log in to Hudson",
+ "FormLogin.log_in=Log in to Jenkins",
"# {0} - server location", "# {1} - user name",
"FormLogin.password_description=Password for {1} on {0}"
})
@Override
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddInstanceAction.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddInstanceAction.java
index 10e5e20ae1..579f6ef154 100644
---
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddInstanceAction.java
+++
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddInstanceAction.java
@@ -26,7 +26,7 @@ import org.netbeans.modules.hudson.ui.wizard.InstanceDialog;
import org.openide.util.NbBundle;
/**
- * Add Hudson instance action launches the wizard.
+ * Add Jenkins instance action launches the wizard.
*/
public class AddInstanceAction extends AbstractAction {
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java
index 7a2e9f8b61..168a62155e 100644
---
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java
+++
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java
@@ -45,7 +45,7 @@ public class AddTestInstanceAction extends AbstractAction
implements Runnable {
private static final Logger LOG =
Logger.getLogger(AddTestInstanceAction.class.getName());
- @Messages("AddTestInstanceAction.label=Try Hudson on &Localhost")
+ @Messages("AddTestInstanceAction.label=Try Jenkins on &Localhost")
public AddTestInstanceAction() {
super(Bundle.AddTestInstanceAction_label());
}
@@ -57,8 +57,8 @@ public class AddTestInstanceAction extends AbstractAction
implements Runnable {
@Messages({
"# {0} - path to javaws", "AddTestInstanceAction.no_javaws=Could not
find {0}. Run: javaws https://hudson.dev.java.net/hudson.jnlp";,
- "AddTestInstanceAction.could_not_run=Could not download or run Hudson.
Run: javaws https://hudson.dev.java.net/hudson.jnlp";,
- "AddTestInstanceAction.starting=Downloading & running Hudson...",
+ "AddTestInstanceAction.could_not_run=Could not download or run
Jenkins. Run: javaws https://hudson.dev.java.net/hudson.jnlp";,
+ "AddTestInstanceAction.starting=Downloading & running Jenkins...",
"AddTestInstanceAction.instance_name=Local Test Server"
})
@Override
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/Bundle.properties
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/Bundle.properties
index e4f9807b3a..1d245e7f29 100644
--- a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/Bundle.properties
+++ b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/Bundle.properties
@@ -15,18 +15,18 @@
# specific language governing permissions and limitations
# under the License.
-LBL_Add_Instance=&Add Hudson Instance...
+LBL_Add_Instance=&Add jenkins Instance...
LBL_StartJobAction=&Start Job
ShowChanges.label=Show Changes
ShowChanges.no_changes=No changes.
# {0} - job #build
ShowChanges.title={0} changes
-CreateJobPanel.pick_server=Pick a Hudson server to create a job on.
+CreateJobPanel.pick_server=Pick a Jenkins server to create a job on.
CreateJobPanel.pick_project=Pick a project to create a job for.
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.already_associated=This project already seems to be associated
with a Jenkins 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.
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/CreateJob.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/CreateJob.java
index 4cebe9464c..839de53d09 100644
--- a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/CreateJob.java
+++ b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/CreateJob.java
@@ -139,10 +139,10 @@ public class CreateJob implements ActionListener {
"CreateJob.failure=Could not create job. Please check your server's
log for details.",
"# UI logging of creating new build job",
"# {0} - project type",
- "UI_HUDSON_JOB_CREATED=New Hudson build job created [project type:
{0}]",
+ "UI_HUDSON_JOB_CREATED=New Jenkins build job created [project type:
{0}]",
"# Usage Logging",
"# {0} - project type",
- "USG_HUDSON_JOB_CREATED=New Hudson build job created [project type:
{0}]"
+ "USG_HUDSON_JOB_CREATED=New Jenkins build job created [project type:
{0}]"
})
private void finalizeJob(HudsonInstance instance, ProjectHudsonJobCreator
creator, String name, Project project) {
try {
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/ProjectAssociationAction.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/ProjectAssociationAction.java
index 47805b5b43..1612aeeb4d 100644
---
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/ProjectAssociationAction.java
+++
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/ProjectAssociationAction.java
@@ -60,8 +60,8 @@ public class ProjectAssociationAction extends AbstractAction {
@Messages({
"ProjectAssociationAction.open_some_projects=Open some projects to
choose from.",
"ProjectAssociationAction.title_select_project=Select Project",
- "ProjectAssociationAction.could_not_associate=Failed to record a
Hudson job association.",
- "ProjectAssociationAction.could_not_dissociate=Failed to find the
Hudson job association to be removed."
+ "ProjectAssociationAction.could_not_associate=Failed to record a
Jenkins job association.",
+ "ProjectAssociationAction.could_not_dissociate=Failed to find the
Jenkins job association to be removed."
})
@Override public void actionPerformed(ActionEvent e) {
if (alreadyAssociatedProject == null) {
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/impl/SearchProviderImpl.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/impl/SearchProviderImpl.java
index b34b29d115..a155eae42c 100644
---
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/impl/SearchProviderImpl.java
+++
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/impl/SearchProviderImpl.java
@@ -30,7 +30,7 @@ import org.netbeans.spi.quicksearch.SearchRequest;
import org.netbeans.spi.quicksearch.SearchResponse;
import org.openide.util.NbBundle.Messages;
-@Messages("quicksearch=Hudson") // QuickSearch/Hudson#displayName
+@Messages("quicksearch=Jenkins") // QuickSearch/Jenkins#displayName
public class SearchProviderImpl implements SearchProvider {
@Override public void evaluate(SearchRequest request, SearchResponse
response) {
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonInstanceNode.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonInstanceNode.java
index 60ea8c8d74..761f020bdd 100644
---
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonInstanceNode.java
+++
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonInstanceNode.java
@@ -143,9 +143,9 @@ public class HudsonInstanceNode extends AbstractNode {
@Messages({
"TXT_Instance_Prop_Name=Name",
- "DESC_Instance_Prop_Name=Hudson's instance name",
+ "DESC_Instance_Prop_Name=Jenkins's instance name",
"TXT_Instance_Prop_Url=URL",
- "DESC_Instance_Prop_Url=Hudson's instance URL",
+ "DESC_Instance_Prop_Url=Jenkins'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)"
})
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonJobNode.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonJobNode.java
index 1404e826aa..7254987375 100644
--- a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonJobNode.java
+++ b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonJobNode.java
@@ -132,9 +132,9 @@ public class HudsonJobNode extends AbstractNode {
@Messages({
"TXT_Job_Prop_Name=Name",
- "DESC_Job_Prop_Name=Hudson's job name",
+ "DESC_Job_Prop_Name=Jenkins's job name",
"TXT_Job_Prop_Url=URL",
- "DESC_Job_Prop_Url=Hudson's job URL",
+ "DESC_Job_Prop_Url=Jenkins's job URL",
"HudsonJobImpl.watched=Watched",
"HudsonJobImpl.watched_desc=Whether you wish to be notified of
failures in this job."
})
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonRootNode.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonRootNode.java
index 953a49a168..430ac08012 100644
--- a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonRootNode.java
+++ b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/nodes/HudsonRootNode.java
@@ -37,12 +37,12 @@ import org.openide.util.NbBundle.Messages;
@ServicesTabNodeRegistration(name=HudsonRootNode.HUDSON_NODE_NAME,
displayName="#LBL_HudsonNode", shortDescription="#TIP_HudsonNode",
iconResource=HudsonRootNode.ICON_BASE, position=488)
@Messages({
- "LBL_HudsonNode=Hudson Builders",
- "TIP_HudsonNode=Hudson continuous integration servers, including Jenkins."
+ "LBL_HudsonNode=Jenkins Builders",
+ "TIP_HudsonNode=Jenkins continuous integration servers, including Jenkins."
})
public class HudsonRootNode extends AbstractNode {
- public static final String HUDSON_NODE_NAME = "hudson"; // NOI18N
+ public static final String HUDSON_NODE_NAME = "jenkins"; // NOI18N
static final String ICON_BASE =
"org/netbeans/modules/hudson/ui/resources/hudson.png"; // NOI18N
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/notification/ProblemNotification.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/notification/ProblemNotification.java
index 23469de555..4fec33642a 100644
---
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/notification/ProblemNotification.java
+++
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/notification/ProblemNotification.java
@@ -113,7 +113,7 @@ class ProblemNotification {
@Messages({
"# {0} - job name",
"# {1} - server name",
- "ProblemNotification.ignore.question=Do you wish to cease to receive
notifications of failures in {0}? If you change your mind, use Services >
Hudson Builders > {1} > {0} > Properties > Watched.",
+ "ProblemNotification.ignore.question=Do you wish to cease to receive
notifications of failures in {0}? If you change your mind, use Services >
Jenkins Builders > {1} > {0} > Properties > Watched.",
"# {0} - job name",
"ProblemNotification.ignore.title=Ignore Failures in {0}"
})
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/resources/instance.png
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/resources/instance.png
index 6e4672a833..b3ae4f4813 100644
Binary files
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/resources/instance.png and
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/resources/instance.png differ
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/Bundle.properties
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/Bundle.properties
index 11b63391b3..32d5bf83e1 100644
--- a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/Bundle.properties
+++ b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/Bundle.properties
@@ -15,10 +15,10 @@
# specific language governing permissions and limitations
# under the License.
-LBL_InstanceWiz_Title=Add Hudson Instance
+LBL_InstanceWiz_Title=Add Jenkins Instance
InstanceDialog.add=Add
-# {0} - minimum supported Hudson version number
-MSG_WrongVersion=Provide a valid Hudson root URL ({0} or newer).
+# {0} - minimum supported Jenkins version number
+MSG_WrongVersion=Provide a valid Jenkins root URL ({0} or newer).
MSG_FailedToConnect=Connection to server failed or resulted in error.
MSG_incorrect_redirects=Server fails to redirect query strings
(http://seothegame.com/redirects-on-windows-servers-iis-61)
@@ -39,6 +39,6 @@ InstanceDialog.http_protocol=Must be an HTTP(S) URL.
InstancePropertiesVisual.proxyButton.AccessibleContext.accessibleDescription=Configure
your HTTP(S) proxy.
InstancePropertiesVisual.autoSyncCheckBox.AccessibleContext.accessibleDescription=Automatically
refresh the server periodically.
InstancePropertiesVisual.nameTxt.AccessibleContext.accessibleDescription=Name
by which this server will be displayed.
-InstancePropertiesVisual.urlTxt.AccessibleContext.accessibleDescription=Base
location of the Hudson installation.
-InstancePropertiesVisual.AccessibleContext.accessibleDescription=Register a
Hudson server in the IDE.
+InstancePropertiesVisual.urlTxt.AccessibleContext.accessibleDescription=Base
location of the Jenkins installation.
+InstancePropertiesVisual.AccessibleContext.accessibleDescription=Register a
Jenkins server in the IDE.
InstancePropertiesVisual.autoSyncSpinner.AccessibleContext.accessibleDescription=Number
of minutes between server refreshes.
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/InstanceDialog.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/InstanceDialog.java
index b51d20be91..11f6bfffc4 100644
---
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/InstanceDialog.java
+++
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/wizard/InstanceDialog.java
@@ -67,15 +67,15 @@ public class InstanceDialog extends DialogDescriptor {
public HudsonInstance show() {
dialog = DialogDisplayer.getDefault().createDialog(this);
dialog.setVisible(true);
- LOG.log(Level.FINE, "Added Hudson instance: {0}", created);
+ LOG.log(Level.FINE, "Added Jenkins instance: {0}", created);
return created;
}
@NbBundle.Messages({
"# UI logging of adding new server",
- "UI_HUDSON_SERVER_REGISTERED=Hudson server registered",
+ "UI_HUDSON_SERVER_REGISTERED=Jenkins server registered",
"# Usage Logging",
- "USG_HUDSON_SERVER_REGISTERED=Hudson server registered"
+ "USG_HUDSON_SERVER_REGISTERED=Jenkins server registered"
})
private void tryToAdd() {
addButton.setEnabled(false);
diff --git a/ide/hudson/src/org/netbeans/modules/hudson/Bundle.properties
b/ide/hudson/src/org/netbeans/modules/hudson/Bundle.properties
index 9ed3042833..7a120b38eb 100644
--- a/ide/hudson/src/org/netbeans/modules/hudson/Bundle.properties
+++ b/ide/hudson/src/org/netbeans/modules/hudson/Bundle.properties
@@ -17,7 +17,6 @@
OpenIDE-Module-Display-Category=Base IDE
OpenIDE-Module-Long-Description=\
- Helps browse and manage installations of the Hudson continuous integration
server (http://hudson-ci.org/). \
- http://wiki.netbeans.org/HudsonInNetBeans has more information.
-OpenIDE-Module-Name=Hudson
-OpenIDE-Module-Short-Description=Support for the Hudson continuous integration
server.
+ Helps browse and manage installations of the Jenkins continuous
integration server (https://www.jenkins.io/ ).
+OpenIDE-Module-Name=Jenkins
+OpenIDE-Module-Short-Description=Support for the Jenkins continuous
integration server.
diff --git a/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonFolder.java
b/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonFolder.java
index 8a8ec25da1..725e2ac9f9 100644
--- a/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonFolder.java
+++ b/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonFolder.java
@@ -29,7 +29,7 @@ import javax.swing.event.ChangeListener;
* This is not such a loss, since heavy users of folders are not likely to
need lots of views anyway.
* The standard connector also assumes that there is an exported {@link
primaryView} field,
* defined in the Jenkins version of the interface.
- * <p>In the Hudson/Jenkins model, this would really in an inheritance
hierarchy with {@link HudsonJob} and {@link HudsonInstance},
+ * <p>In the Jenkins model, this would really in an inheritance hierarchy with
{@link HudsonJob} and {@link HudsonInstance},
* but due to the many methods in those interfaces which make no sense on
folders, it seems better to separate them.
* @since hudson/1.31
*/
diff --git a/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonJob.java
b/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonJob.java
index 86c40c26bd..f63985cdf2 100644
--- a/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonJob.java
+++ b/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonJob.java
@@ -31,7 +31,7 @@ import org.openide.filesystems.FileSystem;
public interface HudsonJob extends Comparable<HudsonJob> {
/**
- * Describes state of the Hudson Job.
+ * Describes state of the Jenkins Job.
* See {@code hudson.model.BallColor}.
*/
public enum Color {
@@ -100,14 +100,14 @@ public interface HudsonJob extends Comparable<HudsonJob> {
public String getDisplayName();
/**
- * Name of the Hudson Job
+ * Name of the Jenkins Job
*
* @return job's name
*/
public String getName();
/**
- * URL of the Hudson Job
+ * URL of the Jenkins Job
*
* @return job url
*/
diff --git
a/ide/hudson/test/unit/src/org/netbeans/modules/hudson/impl/HudsonManagerImplTest.java
b/ide/hudson/test/unit/src/org/netbeans/modules/hudson/impl/HudsonManagerImplTest.java
index bff83deaf9..333aa6727e 100644
---
a/ide/hudson/test/unit/src/org/netbeans/modules/hudson/impl/HudsonManagerImplTest.java
+++
b/ide/hudson/test/unit/src/org/netbeans/modules/hudson/impl/HudsonManagerImplTest.java
@@ -61,7 +61,7 @@ public class HudsonManagerImplTest {
delay();
HudsonManagerImpl.getDefault().addInstance(
HudsonInstanceImpl.createHudsonInstance(
- "TestHudsonInstance" + i,
+ "TestJenkinsInstance" + i,
"http://testHudsonInstance"; + i + "/",
"0"));
} catch (Throwable e) {
@@ -71,7 +71,7 @@ public class HudsonManagerImplTest {
}
}
}
- }, "AddHudsonInstances");
+ }, "AddJenkinsInstances");
addInstancesThread.start();
for (int i = 0; i < 10; i++) {
diff --git a/nbbuild/licenses/CC-BY-SA-3.0 b/nbbuild/licenses/CC-BY-SA-3.0
new file mode 100644
index 0000000000..604209a804
--- /dev/null
+++ b/nbbuild/licenses/CC-BY-SA-3.0
@@ -0,0 +1,359 @@
+Creative Commons Legal Code
+
+Attribution-ShareAlike 3.0 Unported
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+ DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+CONDITIONS.
+
+1. Definitions
+
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+ other pre-existing works, such as a translation, adaptation,
+ derivative work, arrangement of music or other alterations of a
+ literary or artistic work, or phonogram or performance and includes
+ cinematographic adaptations or any other form in which the Work may be
+ recast, transformed, or adapted including in any form recognizably
+ derived from the original, except that a work that constitutes a
+ Collection will not be considered an Adaptation for the purpose of
+ this License. For the avoidance of doubt, where the Work is a musical
+ work, performance or phonogram, the synchronization of the Work in
+ timed-relation with a moving image ("synching") will be considered an
+ Adaptation for the purpose of this License.
+ b. "Collection" means a collection of literary or artistic works, such as
+ encyclopedias and anthologies, or performances, phonograms or
+ broadcasts, or other works or subject matter other than works listed
+ in Section 1(f) below, which, by reason of the selection and
+ arrangement of their contents, constitute intellectual creations, in
+ which the Work is included in its entirety in unmodified form along
+ with one or more other contributions, each constituting separate and
+ independent works in themselves, which together are assembled into a
+ collective whole. A work that constitutes a Collection will not be
+ considered an Adaptation (as defined below) for the purposes of this
+ License.
+ c. "Creative Commons Compatible License" means a license that is listed
+ at https://creativecommons.org/compatiblelicenses that has been
+ approved by Creative Commons as being essentially equivalent to this
+ License, including, at a minimum, because that license: (i) contains
+ terms that have the same purpose, meaning and effect as the License
+ Elements of this License; and, (ii) explicitly permits the relicensing
+ of adaptations of works made available under that license under this
+ License or a Creative Commons jurisdiction license with the same
+ License Elements as this License.
+ d. "Distribute" means to make available to the public the original and
+ copies of the Work or Adaptation, as appropriate, through sale or
+ other transfer of ownership.
+ e. "License Elements" means the following high-level license attributes
+ as selected by Licensor and indicated in the title of this License:
+ Attribution, ShareAlike.
+ f. "Licensor" means the individual, individuals, entity or entities that
+ offer(s) the Work under the terms of this License.
+ g. "Original Author" means, in the case of a literary or artistic work,
+ the individual, individuals, entity or entities who created the Work
+ or if no individual or entity can be identified, the publisher; and in
+ addition (i) in the case of a performance the actors, singers,
+ musicians, dancers, and other persons who act, sing, deliver, declaim,
+ play in, interpret or otherwise perform literary or artistic works or
+ expressions of folklore; (ii) in the case of a phonogram the producer
+ being the person or legal entity who first fixes the sounds of a
+ performance or other sounds; and, (iii) in the case of broadcasts, the
+ organization that transmits the broadcast.
+ h. "Work" means the literary and/or artistic work offered under the terms
+ of this License including without limitation any production in the
+ literary, scientific and artistic domain, whatever may be the mode or
+ form of its expression including digital form, such as a book,
+ pamphlet and other writing; a lecture, address, sermon or other work
+ of the same nature; a dramatic or dramatico-musical work; a
+ choreographic work or entertainment in dumb show; a musical
+ composition with or without words; a cinematographic work to which are
+ assimilated works expressed by a process analogous to cinematography;
+ a work of drawing, painting, architecture, sculpture, engraving or
+ lithography; a photographic work to which are assimilated works
+ expressed by a process analogous to photography; a work of applied
+ art; an illustration, map, plan, sketch or three-dimensional work
+ relative to geography, topography, architecture or science; a
+ performance; a broadcast; a phonogram; a compilation of data to the
+ extent it is protected as a copyrightable work; or a work performed by
+ a variety or circus performer to the extent it is not otherwise
+ considered a literary or artistic work.
+ i. "You" means an individual or entity exercising rights under this
+ License who has not previously violated the terms of this License with
+ respect to the Work, or who has received express permission from the
+ Licensor to exercise rights under this License despite a previous
+ violation.
+ j. "Publicly Perform" means to perform public recitations of the Work and
+ to communicate to the public those public recitations, by any means or
+ process, including by wire or wireless means or public digital
+ performances; to make available to the public Works in such a way that
+ members of the public may access these Works from a place and at a
+ place individually chosen by them; to perform the Work to the public
+ by any means or process and the communication to the public of the
+ performances of the Work, including by public digital performance; to
+ broadcast and rebroadcast the Work by any means including signs,
+ sounds or images.
+ k. "Reproduce" means to make copies of the Work by any means including
+ without limitation by sound or visual recordings and the right of
+ fixation and reproducing fixations of the Work, including storage of a
+ protected performance or phonogram in digital form or other electronic
+ medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+limit, or restrict any uses free from copyright or rights arising from
+limitations or exceptions that are provided for in connection with the
+copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License,
+Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+perpetual (for the duration of the applicable copyright) license to
+exercise the rights in the Work as stated below:
+
+ a. to Reproduce the Work, to incorporate the Work into one or more
+ Collections, and to Reproduce the Work as incorporated in the
+ Collections;
+ b. to create and Reproduce Adaptations provided that any such Adaptation,
+ including any translation in any medium, takes reasonable steps to
+ clearly label, demarcate or otherwise identify that changes were made
+ to the original Work. For example, a translation could be marked "The
+ original work was translated from English to Spanish," or a
+ modification could indicate "The original work has been modified.";
+ c. to Distribute and Publicly Perform the Work including as incorporated
+ in Collections; and,
+ d. to Distribute and Publicly Perform Adaptations.
+ e. For the avoidance of doubt:
+
+ i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+ which the right to collect royalties through any statutory or
+ compulsory licensing scheme cannot be waived, the Licensor
+ reserves the exclusive right to collect such royalties for any
+ exercise by You of the rights granted under this License;
+ ii. Waivable Compulsory License Schemes. In those jurisdictions in
+ which the right to collect royalties through any statutory or
+ compulsory licensing scheme can be waived, the Licensor waives the
+ exclusive right to collect such royalties for any exercise by You
+ of the rights granted under this License; and,
+ iii. Voluntary License Schemes. The Licensor waives the right to
+ collect royalties, whether individually or, in the event that the
+ Licensor is a member of a collecting society that administers
+ voluntary licensing schemes, via that society, from any exercise
+ by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights in
+other media and formats. Subject to Section 8(f), all rights not expressly
+granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+ a. You may Distribute or Publicly Perform the Work only under the terms
+ of this License. You must include a copy of, or the Uniform Resource
+ Identifier (URI) for, this License with every copy of the Work You
+ Distribute or Publicly Perform. You may not offer or impose any terms
+ on the Work that restrict the terms of this License or the ability of
+ the recipient of the Work to exercise the rights granted to that
+ recipient under the terms of the License. You may not sublicense the
+ Work. You must keep intact all notices that refer to this License and
+ to the disclaimer of warranties with every copy of the Work You
+ Distribute or Publicly Perform. When You Distribute or Publicly
+ Perform the Work, You may not impose any effective technological
+ measures on the Work that restrict the ability of a recipient of the
+ Work from You to exercise the rights granted to that recipient under
+ the terms of the License. This Section 4(a) applies to the Work as
+ incorporated in a Collection, but this does not require the Collection
+ apart from the Work itself to be made subject to the terms of this
+ License. If You create a Collection, upon notice from any Licensor You
+ must, to the extent practicable, remove from the Collection any credit
+ as required by Section 4(c), as requested. If You create an
+ Adaptation, upon notice from any Licensor You must, to the extent
+ practicable, remove from the Adaptation any credit as required by
+ Section 4(c), as requested.
+ b. You may Distribute or Publicly Perform an Adaptation only under the
+ terms of: (i) this License; (ii) a later version of this License with
+ the same License Elements as this License; (iii) a Creative Commons
+ jurisdiction license (either this or a later license version) that
+ contains the same License Elements as this License (e.g.,
+ Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
+ License. If you license the Adaptation under one of the licenses
+ mentioned in (iv), you must comply with the terms of that license. If
+ you license the Adaptation under the terms of any of the licenses
+ mentioned in (i), (ii) or (iii) (the "Applicable License"), you must
+ comply with the terms of the Applicable License generally and the
+ following provisions: (I) You must include a copy of, or the URI for,
+ the Applicable License with every copy of each Adaptation You
+ Distribute or Publicly Perform; (II) You may not offer or impose any
+ terms on the Adaptation that restrict the terms of the Applicable
+ License or the ability of the recipient of the Adaptation to exercise
+ the rights granted to that recipient under the terms of the Applicable
+ License; (III) You must keep intact all notices that refer to the
+ Applicable License and to the disclaimer of warranties with every copy
+ of the Work as included in the Adaptation You Distribute or Publicly
+ Perform; (IV) when You Distribute or Publicly Perform the Adaptation,
+ You may not impose any effective technological measures on the
+ Adaptation that restrict the ability of a recipient of the Adaptation
+ from You to exercise the rights granted to that recipient under the
+ terms of the Applicable License. This Section 4(b) applies to the
+ Adaptation as incorporated in a Collection, but this does not require
+ the Collection apart from the Adaptation itself to be made subject to
+ the terms of the Applicable License.
+ c. If You Distribute, or Publicly Perform the Work or any Adaptations or
+ Collections, You must, unless a request has been made pursuant to
+ Section 4(a), keep intact all copyright notices for the Work and
+ provide, reasonable to the medium or means You are utilizing: (i) the
+ name of the Original Author (or pseudonym, if applicable) if supplied,
+ and/or if the Original Author and/or Licensor designate another party
+ or parties (e.g., a sponsor institute, publishing entity, journal) for
+ attribution ("Attribution Parties") in Licensor's copyright notice,
+ terms of service or by other reasonable means, the name of such party
+ or parties; (ii) the title of the Work if supplied; (iii) to the
+ extent reasonably practicable, the URI, if any, that Licensor
+ specifies to be associated with the Work, unless such URI does not
+ refer to the copyright notice or licensing information for the Work;
+ and (iv) , consistent with Ssection 3(b), in the case of an
+ Adaptation, a credit identifying the use of the Work in the Adaptation
+ (e.g., "French translation of the Work by Original Author," or
+ "Screenplay based on original Work by Original Author"). The credit
+ required by this Section 4(c) may be implemented in any reasonable
+ manner; provided, however, that in the case of a Adaptation or
+ Collection, at a minimum such credit will appear, if a credit for all
+ contributing authors of the Adaptation or Collection appears, then as
+ part of these credits and in a manner at least as prominent as the
+ credits for the other contributing authors. For the avoidance of
+ doubt, You may only use the credit required by this Section for the
+ purpose of attribution in the manner set out above and, by exercising
+ Your rights under this License, You may not implicitly or explicitly
+ assert or imply any connection with, sponsorship or endorsement by the
+ Original Author, Licensor and/or Attribution Parties, as appropriate,
+ of You or Your use of the Work, without the separate, express prior
+ written permission of the Original Author, Licensor and/or Attribution
+ Parties.
+ d. Except as otherwise agreed in writing by the Licensor or as may be
+ otherwise permitted by applicable law, if You Reproduce, Distribute or
+ Publicly Perform the Work either by itself or as part of any
+ Adaptations or Collections, You must not distort, mutilate, modify or
+ take other derogatory action in relation to the Work which would be
+ prejudicial to the Original Author's honor or reputation. Licensor
+ agrees that in those jurisdictions (e.g. Japan), in which any exercise
+ of the right granted in Section 3(b) of this License (the right to
+ make Adaptations) would be deemed to be a distortion, mutilation,
+ modification or other derogatory action prejudicial to the Original
+ Author's honor and reputation, the Licensor will waive or not assert,
+ as appropriate, this Section, to the fullest extent permitted by the
+ applicable national law, to enable You to reasonably exercise Your
+ right under Section 3(b) of this License (right to make Adaptations)
+ but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+ a. This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this License.
+ Individuals or entities who have received Adaptations or Collections
+ from You under this License, however, will not have their licenses
+ terminated provided such individuals or entities remain in full
+ compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+ survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted here is
+ perpetual (for the duration of the applicable copyright in the Work).
+ Notwithstanding the above, Licensor reserves the right to release the
+ Work under different license terms or to stop distributing the Work at
+ any time; provided, however that any such election will not serve to
+ withdraw this License (or any other license that has been, or is
+ required to be, granted under the terms of this License), and this
+ License will continue in full force and effect unless terminated as
+ stated above.
+
+8. Miscellaneous
+
+ a. Each time You Distribute or Publicly Perform the Work or a Collection,
+ the Licensor offers to the recipient a license to the Work on the same
+ terms and conditions as the license granted to You under this License.
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+ offers to the recipient a license to the original Work on the same
+ terms and conditions as the license granted to You under this License.
+ c. If any provision of this License is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of
+ the remainder of the terms of this License, and without further action
+ by the parties to this agreement, such provision shall be reformed to
+ the minimum extent necessary to make such provision valid and
+ enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+ breach consented to unless such waiver or consent shall be in writing
+ and signed by the party to be charged with such waiver or consent.
+ e. This License constitutes the entire agreement between the parties with
+ respect to the Work licensed here. There are no understandings,
+ agreements or representations with respect to the Work not specified
+ here. Licensor shall not be bound by any additional provisions that
+ may appear in any communication from You. This License may not be
+ modified without the mutual written agreement of the Licensor and You.
+ f. The rights granted under, and the subject matter referenced, in this
+ License were drafted utilizing the terminology of the Berne Convention
+ for the Protection of Literary and Artistic Works (as amended on
+ September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+ Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
+ and the Universal Copyright Convention (as revised on July 24, 1971).
+ These rights and subject matter take effect in the relevant
+ jurisdiction in which the License terms are sought to be enforced
+ according to the corresponding provisions of the implementation of
+ those treaty provisions in the applicable national law. If the
+ standard suite of rights granted under applicable copyright law
+ includes additional rights not granted under this License, such
+ additional rights are deemed to be included in the License; this
+ License is not intended to restrict the license of any rights under
+ applicable law.
+
+
+Creative Commons Notice
+
+ Creative Commons is not a party to this License, and makes no warranty
+ whatsoever in connection with the Work. Creative Commons will not be
+ liable to You or any party on any legal theory for any damages
+ whatsoever, including without limitation any general, special,
+ incidental or consequential damages arising in connection to this
+ license. Notwithstanding the foregoing two (2) sentences, if Creative
+ Commons has expressly identified itself as the Licensor hereunder, it
+ shall have all rights and obligations of Licensor.
+
+ Except for the limited purpose of indicating to the public that the
+ Work is licensed under the CCPL, Creative Commons does not authorize
+ the use by either party of the trademark "Creative Commons" or any
+ related trademark or logo of Creative Commons without the prior
+ written consent of Creative Commons. Any permitted use will be in
+ compliance with Creative Commons' then-current trademark usage
+ guidelines, as may be published on its website or otherwise made
+ available upon request from time to time. For the avoidance of doubt,
+ this trademark restriction does not form part of the License.
+
+ Creative Commons may be contacted at https://creativecommons.org/.
diff --git
a/php/hudson.php/src/org/netbeans/modules/hudson/php/HudsonJobCreator.java
b/php/hudson.php/src/org/netbeans/modules/hudson/php/HudsonJobCreator.java
index 2ad5e82eba..b74dea7ffd 100644
--- a/php/hudson.php/src/org/netbeans/modules/hudson/php/HudsonJobCreator.java
+++ b/php/hudson.php/src/org/netbeans/modules/hudson/php/HudsonJobCreator.java
@@ -96,7 +96,7 @@ public final class HudsonJobCreator extends JPanel implements
ProjectHudsonJobCr
@NbBundle.Messages({
"HudsonJobCreator.error.noTests=The project does not have any tests.",
- "HudsonJobCreator.error.invalidHudsonOptions=PHP Hudson options are
invalid.",
+ "HudsonJobCreator.error.invalidHudsonOptions=PHP Jenkins options are
invalid.",
"# {0} - file name",
"HudsonJobCreator.warning.fileExists=Existing project file {0} will be
used.",
})
@@ -172,8 +172,8 @@ public final class HudsonJobCreator extends JPanel
implements ProjectHudsonJobCr
}
@NbBundle.Messages({
- "HudsonJobCreator.button.labelWithMnemonics=&Hudson Options...",
- "HudsonJobCreator.button.a11y=Open Hudson PHP options."
+ "HudsonJobCreator.button.labelWithMnemonics=&Jenkins Options...",
+ "HudsonJobCreator.button.a11y=Open Jenkins PHP options."
})
private JButton getOpenHudsonOptionsButton() {
JButton button = new JButton();
diff --git
a/php/hudson.php/src/org/netbeans/modules/hudson/php/resources/Bundle.properties
b/php/hudson.php/src/org/netbeans/modules/hudson/php/resources/Bundle.properties
index 77759a90b3..ac104dcc80 100644
---
a/php/hudson.php/src/org/netbeans/modules/hudson/php/resources/Bundle.properties
+++
b/php/hudson.php/src/org/netbeans/modules/hudson/php/resources/Bundle.properties
@@ -16,7 +16,7 @@
# under the License.
# general
-OpenIDE-Module-Name=Hudson PHP Project Support
+OpenIDE-Module-Name=Jenkins PHP Project Support
# options export/import
-LBL_HudsonExportName=Hudson
+LBL_HudsonExportName=Jenkins
diff --git
a/php/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties
b/php/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties
index 5c5cd9dd94..420e7b16b0 100644
---
a/php/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties
+++
b/php/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-LBL_HudsonPHPOptionsName=Hudson
+LBL_HudsonPHPOptionsName=Jenkins
HudsonOptionsPanel.jobConfigLabel.text=&Job Config:
HudsonOptionsPanel.jobConfigBrowseButton.text=Bro&wse...
HudsonOptionsPanel.jobConfigDownloadLabel.text=<html><a href="#">View Latest
Version of Job Config</a>
diff --git
a/php/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java
b/php/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java
index 5f7bf51cc8..e18afea4ef 100644
---
a/php/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java
+++
b/php/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java
@@ -351,7 +351,7 @@ public class HudsonOptionsPanel extends JPanel {
"# {0} - file name",
"HudsonOptionsPanel.jobConfig.browse.title=Select job config ({0})",
"# {0} - file name",
- "HudsonOptionsPanel.jobConfig.browse.filter=Hudson job config file
({0})",
+ "HudsonOptionsPanel.jobConfig.browse.filter=Jenkins job config file
({0})",
})
private void jobConfigBrowseButtonActionPerformed(ActionEvent evt)
{//GEN-FIRST:event_jobConfigBrowseButtonActionPerformed
File jobConfig = new
FileChooserBuilder(HudsonOptionsPanel.class.getName() +
JOB_CONFIG_LAST_FOLDER_SUFFIX)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
