[hg] main-silver: strip 'hudson' path from deadlock.nb.org

  • From: Tomas Hurka < >
  • To: , , , , , , ,
  • Subject: [hg] main-silver: strip 'hudson' path from deadlock.nb.org
  • Date: Wed, 10 Jul 2013 21:34:13 -0700

changeset d759dd42deea in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/d759dd42deea
description:
        strip 'hudson' path from deadlock.nb.org

diffstat:

 apisupport.harness/release/README                                            
                  |  4 ++--
 hudson.ui/src/org/netbeans/modules/hudson/ui/spi/ProjectHudsonProvider.java  
                  |  2 +-
 hudson/src/org/netbeans/modules/hudson/api/HudsonManager.java                
                  |  6 +++---
 nbbuild/default-properties.xml                                               
                  |  2 +-
 nbbuild/hudson/sigtests                                                      
                  |  2 +-
 nbbuild/hudson/test-platform                                                 
                  |  4 ++--
 nbbuild/javadoctools/export2apichanges-atom.xsl                              
                  |  2 +-
 nbbuild/templates/projectized.xml                                            
                  |  2 +-
 
o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
 |  4 ++--
 o.n.insane/src/org/netbeans/insane/live/Path.java                            
                  |  2 +-
 openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java   
                  |  2 +-
 openide.filesystems/src/org/openide/filesystems/doc-files/HOWTO-MIME.html    
                  |  2 +-
 
openide.filesystems/test/unit/src/org/openide/filesystems/ContentProviderTest.java
             |  2 +-
 openide.loaders/test/unit/src/org/openide/loaders/DataNodeTest.java          
                  |  2 +-
 openide.options/test/unit/src/org/openide/options/SystemOptionTest.java      
                  |  2 +-
 openide.text/test/unit/src/org/openide/text/CloneableEditorSupportTest.java  
                  |  2 +-
 projectapi/test/unit/src/org/netbeans/api/project/ProjectUtilsTest.java      
                  |  2 +-
 17 files changed, 22 insertions(+), 22 deletions(-)

diffs (242 lines):

diff --git a/apisupport.harness/release/README 
b/apisupport.harness/release/README
--- a/apisupport.harness/release/README
+++ b/apisupport.harness/release/README
@@ -973,7 +973,7 @@
   this property. Sample values with prebuilt binaries (good for testing):
 http://bits.netbeans.org/6.5/jnlp/
 http://bits.netbeans.org/6.7/fcs/jnlp/
-http://deadlock.netbeans.org/hudson/job/ide-jnlp/lastStableBuild/artifact/nbbuild/build/jnlp/
+http://deadlock.netbeans.org/job/ide-jnlp/lastStableBuild/artifact/nbbuild/build/jnlp/
 
 jnlp.indirect.jars [since 6.0] - optional pattern of JARs in the cluster to 
load
   in JNLP mode even though they are not listed as Class-Path extensions of 
the
@@ -1040,7 +1040,7 @@
 +suite.dir=${basedir}
 +nbplatform.active.dir=${suite.dir}/nb
 +harness.dir=${nbplatform.active.dir}/harness
-+bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
++bootstrap.url=http://deadlock.netbeans.org/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
 
+autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/7.0.1/uc/final/distribution/catalog.xml.gz
 
 cluster.path [since 6.7] - list of clusters to build your modules against and
diff --git 
a/hudson.ui/src/org/netbeans/modules/hudson/ui/spi/ProjectHudsonProvider.java 
b/hudson.ui/src/org/netbeans/modules/hudson/ui/spi/ProjectHudsonProvider.java
--- 
a/hudson.ui/src/org/netbeans/modules/hudson/ui/spi/ProjectHudsonProvider.java
+++ 
b/hudson.ui/src/org/netbeans/modules/hudson/ui/spi/ProjectHudsonProvider.java
@@ -234,7 +234,7 @@
         }
 
         /**
-         * @return the root URL of the server ending in slash, e.g. {@code 
http://deadlock.netbeans.org/hudson/}
+         * @return the root URL of the server ending in slash, e.g. {@code 
http://deadlock.netbeans.org/}
          */
         public String getServerUrl() {
             return jobPath[0];
diff --git a/hudson/src/org/netbeans/modules/hudson/api/HudsonManager.java 
b/hudson/src/org/netbeans/modules/hudson/api/HudsonManager.java
--- a/hudson/src/org/netbeans/modules/hudson/api/HudsonManager.java
+++ b/hudson/src/org/netbeans/modules/hudson/api/HudsonManager.java
@@ -60,7 +60,7 @@
     /**
      * Adds a Hudson instance to the system (if not already registered).
      * @param name a name by which the instance will be identified (e.g. 
{@code Deadlock})
-     * @param url the master URL (e.g. {@code 
http://deadlock.netbeans.org/hudson/})
+     * @param url the master URL (e.g. {@code http://deadlock.netbeans.org/})
      * @param sync interval (in minutes) between refreshes, or 0 to disable
      * @param persistent if true, persist this configuration; if false, will 
be transient
      * @return a new or existing instance
@@ -76,7 +76,7 @@
      * @param name a name by which the instance will be identified (e.g.
      * {@code Deadlock})
      * @param url the master URL (e.g.
-     * {@code http://deadlock.netbeans.org/hudson/})
+     * {@code http://deadlock.netbeans.org/})
      * @param sync interval (in minutes) between refreshes, or 0 to disable
      * @param persistence persistence settings for the new instance
      */
@@ -103,7 +103,7 @@
      * @param name a name by which the instance will be identified (e.g.
      * {@code Deadlock})
      * @param url the master URL (e.g.
-     * {@code http://deadlock.netbeans.org/hudson/})
+     * {@code http://deadlock.netbeans.org/})
      * @param sync interval (in minutes) between refreshes, or 0 to disable
      * @param builderConnector Connector for retrieving builder data.
      *
diff --git a/nbbuild/default-properties.xml b/nbbuild/default-properties.xml
--- a/nbbuild/default-properties.xml
+++ b/nbbuild/default-properties.xml
@@ -72,7 +72,7 @@
   <property name="netbeans.javadoc.dir" location="${nb.build.dir}/javadoc"/>
   <property name="moduleCluster.file" 
location="${netbeans.dest.dir}/moduleCluster.properties"/>
 
-  <property name="autoupdate.catalog.url" 
value="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/nbms/updates.xml.gz"/>
+  <property name="autoupdate.catalog.url" 
value="http://deadlock.netbeans.org/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/nbms/updates.xml.gz"/>
 
   <macrodef name="resolve">
     <attribute name="name"/>
diff --git a/nbbuild/hudson/sigtests b/nbbuild/hudson/sigtests
--- a/nbbuild/hudson/sigtests
+++ b/nbbuild/hudson/sigtests
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$JOB_URL" ]; then
-  JOB_URL=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/
+  JOB_URL=http://deadlock.netbeans.org/job/nbms-and-javadoc/
 fi
 
 sigtest_prev=$WORKSPACE/nbbuild/build/prior-sigtest
diff --git a/nbbuild/hudson/test-platform b/nbbuild/hudson/test-platform
--- a/nbbuild/hudson/test-platform
+++ b/nbbuild/hudson/test-platform
@@ -3,8 +3,8 @@
 # XXX consider using lastStableBuild
 BUILD=`wget 
http://deadlock.nbextras.org/hudson/job/trunk/lastSuccessfulBuild/buildNumber ;
-O -`
 
-TESTDIST="http://deadlock.netbeans.org/hudson/job/test-compilation/lastSuccessfulBuild/artifact/nbbuild/build/testdist.zip";
-PLATFORM="http://deadlock.netbeans.org/hudson/job/trunk/lastSuccessfulBuild/artifact/nbbuild/dist/zip/netbeans-hudson-trunk-$BUILD-platform.zip";
+TESTDIST="http://deadlock.netbeans.org/job/test-compilation/lastSuccessfulBuild/artifact/nbbuild/build/testdist.zip";
+PLATFORM="http://deadlock.netbeans.org/job/trunk/lastSuccessfulBuild/artifact/nbbuild/dist/zip/netbeans-hudson-trunk-$BUILD-platform.zip";
 
 [ -f `basename $TESTDIST` ] || wget $TESTDIST
 [ -f `basename $PLATFORM` ] || wget $PLATFORM
diff --git a/nbbuild/javadoctools/export2apichanges-atom.xsl 
b/nbbuild/javadoctools/export2apichanges-atom.xsl
--- a/nbbuild/javadoctools/export2apichanges-atom.xsl
+++ b/nbbuild/javadoctools/export2apichanges-atom.xsl
@@ -55,7 +55,7 @@
             <atom:title>NetBeans API Changes</atom:title>
             <atom:author><atom:name>netbeans.org</atom:name></atom:author>
             <atom:link rel="alternate" type="text/html" 
href="apichanges.html"/>
-            <atom:link rel="self" type="application/xml+atom" 
href="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/javadoc/apichanges.atom"/>
+            <atom:link rel="self" type="application/xml+atom" 
href="http://deadlock.netbeans.org/job/nbms-and-javadoc/javadoc/apichanges.atom"/>
             <atom:updated><xsl:value-of select="$date"/></atom:updated>
             <xsl:apply-templates select="//change">
                 <xsl:sort data-type="number" order="descending" 
select="date/@year"/>
diff --git a/nbbuild/templates/projectized.xml 
b/nbbuild/templates/projectized.xml
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -161,7 +161,7 @@
         <condition property="nbm.distribution" value="${dist.base}/${nbm}"> 
<!-- compatibility -->
             <isset property="dist.base"/>
         </condition>
-        <property name="dist.base.structured" 
value="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/nbms"/>
+        <property name="dist.base.structured" 
value="http://deadlock.netbeans.org/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/nbms"/>
         <property name="nbm.distribution" 
value="${dist.base.structured}/${cluster.dir}/${nbm}"/>
         <property name="nbm.module.author" value=""/>
         <property name="nbm.release.date" value=""/>
diff --git 
a/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
 
b/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
--- 
a/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
+++ 
b/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
@@ -818,7 +818,7 @@
             }
         }
         assertNoErrors("No warnings relating to folder ordering; " +
-                "cf: 
http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/build/generated/layers.txt";,
 h.errors());
+                "cf: 
http://deadlock.netbeans.org/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/build/generated/layers.txt";,
 h.errors());
         for (List<String> multiPath : editorMultiFolders) {
             List<FileSystem> layers = new ArrayList<FileSystem>(3);
             for (final String path : multiPath) {
@@ -834,7 +834,7 @@
             }
             loadChildren(new MultiFileSystem(layers.toArray(new 
FileSystem[layers.size()])).getRoot());
             assertNoErrors("No warnings relating to folder ordering in " + 
multiPath + 
-                    "; cf: 
http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/build/generated/layers.txt";,
+                    "; cf: 
http://deadlock.netbeans.org/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/build/generated/layers.txt";,
                     h.errors());
         }
     }
diff --git a/o.n.insane/src/org/netbeans/insane/live/Path.java 
b/o.n.insane/src/org/netbeans/insane/live/Path.java
--- a/o.n.insane/src/org/netbeans/insane/live/Path.java
+++ b/o.n.insane/src/org/netbeans/insane/live/Path.java
@@ -110,7 +110,7 @@
      */
     public static String describeObject(Object obj) {
         if (obj == null) {
-            // 
http://deadlock.netbeans.org/hudson/job/NB-Core-Build/1393/testReport/org.netbeans.modules.projectapi/AuxiliaryConfigBasedPreferencesProviderTest/testReclaimable/
+            // 
http://deadlock.netbeans.org/job/NB-Core-Build/1393/testReport/org.netbeans.modules.projectapi/AuxiliaryConfigBasedPreferencesProviderTest/testReclaimable/
             // java.lang.NullPointerException
             //         at 
org.netbeans.insane.live.Path.describeObject(Path.java:109)
             //         at 
org.netbeans.insane.live.Path.toString(Path.java:119)
diff --git 
a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java 
b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
--- 
a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
+++ 
b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
@@ -532,7 +532,7 @@
         fail("Node shall not be GCed: " + ref.get());
     }
 
-    @RandomlyFails // 
http://deadlock.netbeans.org/hudson/job/NB-Core-Build/9880/testReport/
+    @RandomlyFails // 
http://deadlock.netbeans.org/job/NB-Core-Build/9880/testReport/
     public void testNodesGCedAfterSetChildrenLazy() {
         doTestNodesGCedAfterSetChildren(true);
     }
diff --git 
a/openide.filesystems/src/org/openide/filesystems/doc-files/HOWTO-MIME.html 
b/openide.filesystems/src/org/openide/filesystems/doc-files/HOWTO-MIME.html
--- 
a/openide.filesystems/src/org/openide/filesystems/doc-files/HOWTO-MIME.html
+++ 
b/openide.filesystems/src/org/openide/filesystems/doc-files/HOWTO-MIME.html
@@ -176,7 +176,7 @@
 folder.
 
 <p>
-    Note that an <a 
href="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/build/generated/layers.txt";>open
 position</a>
+    Note that an <a 
href="http://deadlock.netbeans.org/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/build/generated/layers.txt";>open
 position</a>
     in the system filesystem should be specified.
     Smaller positions mean the resolver runs earlier, which is appropriate 
for
     commonly used file types, or resolvers which logically must take 
precedence
diff --git 
a/openide.filesystems/test/unit/src/org/openide/filesystems/ContentProviderTest.java
 
b/openide.filesystems/test/unit/src/org/openide/filesystems/ContentProviderTest.java
--- 
a/openide.filesystems/test/unit/src/org/openide/filesystems/ContentProviderTest.java
+++ 
b/openide.filesystems/test/unit/src/org/openide/filesystems/ContentProviderTest.java
@@ -58,7 +58,7 @@
         super(name);
     }
 
-    @RandomlyFails // 
http://deadlock.netbeans.org/hudson/job/NB-Core-Build/9882/testReport/
+    @RandomlyFails // 
http://deadlock.netbeans.org/job/NB-Core-Build/9882/testReport/
     public void testCheckAFileFromOurLayer() {
         FileObject fo = FileUtil.getConfigFile("foo/bar");
         assertNotNull("foo/bar is provided", fo);
diff --git 
a/openide.loaders/test/unit/src/org/openide/loaders/DataNodeTest.java 
b/openide.loaders/test/unit/src/org/openide/loaders/DataNodeTest.java
--- a/openide.loaders/test/unit/src/org/openide/loaders/DataNodeTest.java
+++ b/openide.loaders/test/unit/src/org/openide/loaders/DataNodeTest.java
@@ -117,7 +117,7 @@
     }
     */
     
-    @RandomlyFails // 
http://deadlock.netbeans.org/hudson/job/NB-Core-Build/9880/testReport/
+    @RandomlyFails // 
http://deadlock.netbeans.org/job/NB-Core-Build/9880/testReport/
     public void testDataNodeGetHtmlNameDoesNotInitializeAllFiles () throws 
Exception {
         org.openide.filesystems.FileSystem lfs = 
TestUtilHid.createLocalFileSystem(getWorkDir (), new String[] {
             "F.java", "F.form"
diff --git 
a/openide.options/test/unit/src/org/openide/options/SystemOptionTest.java 
b/openide.options/test/unit/src/org/openide/options/SystemOptionTest.java
--- a/openide.options/test/unit/src/org/openide/options/SystemOptionTest.java
+++ b/openide.options/test/unit/src/org/openide/options/SystemOptionTest.java
@@ -66,7 +66,7 @@
     
     /** Test manipulation of a SystemOption in memory.
      */
-    @RandomlyFails // 
http://deadlock.netbeans.org/hudson/job/NB-Core-Build/9882/testReport/
+    @RandomlyFails // 
http://deadlock.netbeans.org/job/NB-Core-Build/9882/testReport/
     public void testBasicUsage() throws Exception {
         assertNull(SharedClassObject.findObject(SimpleOption.class, false));
         SimpleOption o = 
(SimpleOption)SharedClassObject.findObject(SimpleOption.class, true);
diff --git 
a/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportTest.java 
b/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportTest.java
--- 
a/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportTest.java
+++ 
b/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportTest.java
@@ -150,7 +150,7 @@
 
     }
     
-    @RandomlyFails // 
http://deadlock.netbeans.org/hudson/job/NB-Core-Build/9880/testReport/
+    @RandomlyFails // 
http://deadlock.netbeans.org/job/NB-Core-Build/9880/testReport/
     public void testDocumentIsNotGCedIfOpenedInEditor () throws Exception {
         content = "Ahoj\nMyDoc";
         javax.swing.text.Document doc = support.openDocument ();
diff --git 
a/projectapi/test/unit/src/org/netbeans/api/project/ProjectUtilsTest.java 
b/projectapi/test/unit/src/org/netbeans/api/project/ProjectUtilsTest.java
--- a/projectapi/test/unit/src/org/netbeans/api/project/ProjectUtilsTest.java
+++ b/projectapi/test/unit/src/org/netbeans/api/project/ProjectUtilsTest.java
@@ -144,7 +144,7 @@
         assertEquals("D asked for subprojects just once", 1, 
d.getSubprojectsCalled());
     }
     
-    @RandomlyFails // 
http://deadlock.netbeans.org/hudson/job/NB-Core-Build/9880/testReport/
+    @RandomlyFails // 
http://deadlock.netbeans.org/job/NB-Core-Build/9880/testReport/
     public void testGenericSources() throws Exception {
         clearWorkDir();
         File topF = new File(getWorkDir(), "top");

[hg] main-silver: strip 'hudson' path from deadlock.nb.org

Tomas Hurka 07/11/2013

Project Features

About this Project

APIsupport was started in November 2009, is owned by Antonin Nebuzelsky, and has 43 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20131025.e7cbc9d). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close