From 1419cef385c69a758c0f148bc5432d8f570cd4dc Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 26 Mar 2009 17:00:22 +0000 Subject: [PATCH] Merged revisions 16441,16451,16459,16462-16467,16473,16475-16489,16491-16492,16494,16496,16499-16502,16504-16506,16508-16515,16518-16519,16536,16540,16544-16545,16565-16566,16568,16577 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ................ r16441 | kohsuke | 2009-03-20 19:14:25 -0700 (Fri, 20 Mar 2009) | 25 lines Merged revisions 16380-16381,16433,16435,16438 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r16380 | kohsuke | 2009-03-19 17:10:38 -0700 (Thu, 19 Mar 2009) | 1 line PeriodicWork change broke the tests, because the timer registration wasn't kicking in ........ r16381 | kohsuke | 2009-03-19 17:33:14 -0700 (Thu, 19 Mar 2009) | 1 line fixed a test so that it's no longer timing sensitive ........ r16433 | kohsuke | 2009-03-20 18:35:55 -0700 (Fri, 20 Mar 2009) | 1 line [maven-release-plugin] prepare release hudson-1_293 ........ r16435 | kohsuke | 2009-03-20 18:36:21 -0700 (Fri, 20 Mar 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r16438 | kohsuke | 2009-03-20 19:10:29 -0700 (Fri, 20 Mar 2009) | 1 line updated changelog as a part of the release ........ ................ r16451 | jglick | 2009-03-21 11:06:02 -0700 (Sat, 21 Mar 2009) | 2 lines The word "Javadoc" is conventionally capitalized. ................ r16459 | kohsuke | 2009-03-22 11:56:36 -0700 (Sun, 22 Mar 2009) | 3 lines introduced a new scheme to the form field validation, that makes the check feel more like a function. Using it in a few places to begin with ................ r16462 | kohsuke | 2009-03-22 20:26:55 -0700 (Sun, 22 Mar 2009) | 1 line Using new form validation code ................ r16463 | kohsuke | 2009-03-22 20:36:42 -0700 (Sun, 22 Mar 2009) | 1 line removed warnings ................ r16464 | kohsuke | 2009-03-22 20:42:03 -0700 (Sun, 22 Mar 2009) | 1 line added documentation and supported checkUrl computation with @field inheritance ................ r16465 | kohsuke | 2009-03-22 20:53:12 -0700 (Sun, 22 Mar 2009) | 1 line formatting fix ................ r16466 | kohsuke | 2009-03-22 20:56:12 -0700 (Sun, 22 Mar 2009) | 1 line configuration roundtrip test case ................ r16467 | kohsuke | 2009-03-22 22:57:19 -0700 (Sun, 22 Mar 2009) | 4 lines - updated commons-jexl to support "x?y:z" and "x?:y" operators - updated stapler to fix test failures ................ r16473 | swiest | 2009-03-23 06:54:23 -0700 (Mon, 23 Mar 2009) | 1 line Added some German help files. ................ r16475 | jglick | 2009-03-23 08:42:11 -0700 (Mon, 23 Mar 2009) | 1 line NPE thrown when AbstractProject.scm==null. ................ r16476 | kohsuke | 2009-03-23 09:05:59 -0700 (Mon, 23 Mar 2009) | 1 line started puttin elvis operator ................ r16477 | kohsuke | 2009-03-23 09:17:26 -0700 (Mon, 23 Mar 2009) | 2 lines - supportede @default - using the elvis operator ................ r16478 | kohsuke | 2009-03-23 09:19:50 -0700 (Mon, 23 Mar 2009) | 1 line added documentation ................ r16479 | kohsuke | 2009-03-23 09:24:35 -0700 (Mon, 23 Mar 2009) | 1 line using elvis ................ r16480 | kohsuke | 2009-03-23 09:27:27 -0700 (Mon, 23 Mar 2009) | 1 line using the form field binding ................ r16481 | kohsuke | 2009-03-23 09:52:27 -0700 (Mon, 23 Mar 2009) | 1 line fixed NPE ................ r16482 | kohsuke | 2009-03-23 10:09:43 -0700 (Mon, 23 Mar 2009) | 1 line follow the instance/descriptor pattern ................ r16483 | kohsuke | 2009-03-23 10:11:41 -0700 (Mon, 23 Mar 2009) | 3 lines JEXL bug fix. My plugin somehow stopped checking JEXL syntax. ................ r16484 | kohsuke | 2009-03-23 10:13:06 -0700 (Mon, 23 Mar 2009) | 1 line Added DescriptorByNameOwner to enable context-sensitive descriptor mapping in a generic way. ................ r16485 | kohsuke | 2009-03-23 10:14:35 -0700 (Mon, 23 Mar 2009) | 1 line updated to use form field databinding ................ r16486 | kohsuke | 2009-03-23 11:18:18 -0700 (Mon, 23 Mar 2009) | 1 line replaced h.ifThenElse with "x?y:z" (and occasionally with "x?:y") ................ r16487 | kohsuke | 2009-03-23 11:21:12 -0700 (Mon, 23 Mar 2009) | 1 line Noting that "x?y:z" supercedes h.ifThenElse. ................ r16488 | kohsuke | 2009-03-23 11:22:12 -0700 (Mon, 23 Mar 2009) | 1 line Noting that "x?y:z" supercedes h.ifThenElse. ................ r16489 | kohsuke | 2009-03-23 11:26:49 -0700 (Mon, 23 Mar 2009) | 1 line replaced "h.defaulted(x,y)" with "x?:y" ................ r16491 | kohsuke | 2009-03-23 12:18:50 -0700 (Mon, 23 Mar 2009) | 1 line another script to print the version string from POM ................ r16492 | kohsuke | 2009-03-23 12:34:09 -0700 (Mon, 23 Mar 2009) | 1 line Generated RSS 2.0 feeds weren't properly escaping e-mail addresses. ................ r16494 | kohsuke | 2009-03-23 15:49:37 -0700 (Mon, 23 Mar 2009) | 1 line bug fix ................ r16496 | kohsuke | 2009-03-23 15:52:08 -0700 (Mon, 23 Mar 2009) | 1 line Hudson now monitors the temporary directory to forestall disk out of space problems. ................ r16499 | kohsuke | 2009-03-23 17:01:50 -0700 (Mon, 23 Mar 2009) | 1 line indentation fix ................ r16500 | kohsuke | 2009-03-23 17:04:27 -0700 (Mon, 23 Mar 2009) | 1 line Moving the cobertura magic to a profile so that POM won't prevent NetBeans from running a single unit test. ................ r16501 | kohsuke | 2009-03-23 17:05:00 -0700 (Mon, 23 Mar 2009) | 1 line intelliJ keep stealing the keyboard focus, preventing me from multi-tasking ................ r16502 | kohsuke | 2009-03-24 06:54:55 -0700 (Tue, 24 Mar 2009) | 1 line bug fix and simplification with new stapler features ................ r16504 | kohsuke | 2009-03-24 07:19:30 -0700 (Tue, 24 Mar 2009) | 1 line added configuration roundtrip testing ................ r16505 | kohsuke | 2009-03-24 17:31:02 -0700 (Tue, 24 Mar 2009) | 1 line Fixed unit tests that I broke ................ r16506 | kohsuke | 2009-03-24 17:41:15 -0700 (Tue, 24 Mar 2009) | 3 lines this is probably a left-over from an early experiment. We should only hit one repository to improve the build time ................ r16508 | kohsuke | 2009-03-24 19:32:12 -0700 (Tue, 24 Mar 2009) | 3 lines "mvn -Pcobertura install" will now run unit tests with Cobertura. The coverage data file will be published to the Maven repository for further aggregation. ................ r16509 | kohsuke | 2009-03-24 20:45:59 -0700 (Tue, 24 Mar 2009) | 1 line missing serialVersionUID ................ r16510 | kohsuke | 2009-03-24 21:22:50 -0700 (Tue, 24 Mar 2009) | 3 lines forked Maven shouldn't see the Maven debug options. This is only needed during debuggig Hudson and never in production, but this is the only place where we can put this code. ................ r16511 | kohsuke | 2009-03-24 22:08:13 -0700 (Tue, 24 Mar 2009) | 1 line instrumenting the remoting.jar causes the tests to fail, because they are used to start brand-new JVMs ................ r16512 | kohsuke | 2009-03-24 22:08:50 -0700 (Tue, 24 Mar 2009) | 1 line fail method isn't available in this scope ................ r16513 | kohsuke | 2009-03-24 22:17:10 -0700 (Tue, 24 Mar 2009) | 1 line record the thread name during the load operation to assist trouble-shooting ................ r16514 | kohsuke | 2009-03-24 22:21:00 -0700 (Tue, 24 Mar 2009) | 3 lines turns out TFS plugin is using this method. Detected via the bleeding-edge plugin builds ................ r16515 | kohsuke | 2009-03-24 22:23:55 -0700 (Tue, 24 Mar 2009) | 1 line code coverage report from the test harness needs to refer to the core/src/main/java. ................ r16518 | swiest | 2009-03-25 03:21:05 -0700 (Wed, 25 Mar 2009) | 1 line Updated some German localization resources. ................ r16519 | swiest | 2009-03-25 03:22:58 -0700 (Wed, 25 Mar 2009) | 1 line Removed file that was accidentally committed. ................ r16536 | kohsuke | 2009-03-25 09:46:42 -0700 (Wed, 25 Mar 2009) | 41 lines enforcer rule should cover the whole core, since the remoting bulid fails on some JDK5 versions. ---------- [INFO] ---------------------------------------------------------------------------- [INFO] Building Hudson remoting layer [INFO] task-segment: [install] [INFO] ---------------------------------------------------------------------------- [INFO] artifact org.apache.maven.plugins:maven-resources-plugin: checking for updates from m.g.o-public [INFO] artifact org.apache.maven.plugins:maven-surefire-plugin: checking for updates from m.g.o-public [INFO] artifact org.apache.maven.plugins:maven-jar-plugin: checking for updates from m.g.o-public [INFO] [enforcer:display-info {execution: default}] [INFO] Maven Version: 2.0.7 [INFO] JDK Version: 1.5.0_06 normalized as: 1.5.0-6 [INFO] OS Info: Arch: amd64 Family: unix Name: linux Version: 2.6.27-11-generic [INFO] [remote-resources:process {execution: default}] [INFO] inceptionYear not specified, defaulting to 2009 [INFO] [resources:resources] [WARNING] Using platform encoding (ISO-8859-1 actually) to copy filtered resources, i.e. build is platform dependent! [INFO] Copying 1 resource [INFO] [compiler:compile] [INFO] Compiling 46 source files to /files/hudson/workspace/hudson-cobertura/main/remoting/target/classes [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Compilation failure /files/hudson/workspace/hudson-cobertura/main/remoting/src/main/java/hudson/remoting/Request.java:[133,16] unreported exception java.lang.Throwable; must be caught or declared to be thrown /files/hudson/workspace/hudson-cobertura/main/remoting/src/main/java/hudson/remoting/Request.java:[133,16] unreported exception java.lang.Throwable; must be caught or declared to be thrown [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 11 seconds [INFO] Finished at: Wed Mar 25 09:42:20 PDT 2009 [INFO] Final Memory: 40M/207M [INFO] ------------------------------------------------------------------------ Finished: FAILURE ................ r16540 | kohsuke | 2009-03-25 10:17:41 -0700 (Wed, 25 Mar 2009) | 1 line [HUDSON-2800] added more logging so that we can see what's really going on. ................ r16544 | kohsuke | 2009-03-25 11:15:54 -0700 (Wed, 25 Mar 2009) | 1 line added debug switch to maximize the logging level for Maven. See http://www.nabble.com/Bug%3A-Hudson-M2-projects-appear-to-ignore-%7E-.m2-settings.xml-when-first-parsing-pom.xml-td22683417.html ................ r16545 | kohsuke | 2009-03-25 11:17:13 -0700 (Wed, 25 Mar 2009) | 1 line fixed a javadoc bug ................ r16565 | kohsuke | 2009-03-25 17:50:10 -0700 (Wed, 25 Mar 2009) | 1 line generate XML report for Hudson integration ................ r16566 | kohsuke | 2009-03-25 17:52:28 -0700 (Wed, 25 Mar 2009) | 1 line using new stapler ................ r16568 | kohsuke | 2009-03-25 19:07:38 -0700 (Wed, 25 Mar 2009) | 2 lines Release branch for 1.294. ................ r16577 | kohsuke | 2009-03-26 09:47:01 -0700 (Thu, 26 Mar 2009) | 1 line fixed a test failure. legacy descriptors and extensions weren't cleaned up at the end of a test. ................ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16578 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/DescriptorExtensionList.java | 7 +++++ core/src/main/java/hudson/ExtensionList.java | 7 +++++ .../org/jvnet/hudson/test/HudsonTestCase.java | 30 ++++++++----------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java index 3a570dc023..d4bc87db21 100644 --- a/core/src/main/java/hudson/DescriptorExtensionList.java +++ b/core/src/main/java/hudson/DescriptorExtensionList.java @@ -164,5 +164,12 @@ public class DescriptorExtensionList, D extends Descrip }; } + /** + * Exposed just for the test harness. Clear legacy instances. + */ + public static void clearLegacyInstances() { + legacyDescriptors.clear(); + } + private static final Logger LOGGER = Logger.getLogger(DescriptorExtensionList.class.getName()); } diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java index 06b412d0c6..65355cf7f7 100644 --- a/core/src/main/java/hudson/ExtensionList.java +++ b/core/src/main/java/hudson/ExtensionList.java @@ -229,4 +229,11 @@ public class ExtensionList extends AbstractList { return new CopyOnWriteArrayList(); } }; + + /** + * Exposed for the test harness to clear all legacy extension instances. + */ + public static void clearLegacyInstances() { + staticLegacyInstances.clear(); + } } diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 2752f7dc69..eae0243534 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -28,6 +28,8 @@ import hudson.FilePath; import hudson.Functions; import hudson.WebAppMain; import hudson.EnvVars; +import hudson.ExtensionList; +import hudson.DescriptorExtensionList; import hudson.Launcher.LocalLauncher; import hudson.matrix.MatrixProject; import hudson.matrix.MatrixBuild; @@ -214,23 +216,8 @@ public abstract class HudsonTestCase extends TestCase { hudson.cleanUp(); env.dispose(); - } - - private void cleanUpDescriptors(Iterable cont) { - ClassLoader base = getClass().getClassLoader(); - for (Iterator itr = cont.iterator(); itr.hasNext();) { - Descriptor d = itr.next(); - ClassLoader cl = d.getClass().getClassLoader(); - if(cl==base) continue; - - while(cl!=null) { - cl = cl.getParent(); - if(cl==base) { - itr.remove(); - break; - } - } - } + ExtensionList.clearLegacyInstances(); + DescriptorExtensionList.clearLegacyInstances(); } protected void runTest() throws Throwable { @@ -445,6 +432,15 @@ public abstract class HudsonTestCase extends TestCase { } } + /** + * Blocks until the ENTER key is hit. + * This is useful during debugging a test so that one can inspect the state of Hudson through the web browser. + */ + public void interactiveBreak() throws Exception { + System.out.println("Hudson is running at localhost:"+localPort); + new BufferedReader(new InputStreamReader(System.in)).readLine(); + } + /** * Returns the last item in the list. */