Commit Graph
11799 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 2a30cc36d0 a few more follow up Hudson->Jenkins changes 2011-06-07 10:48:02 -07:00
Kohsuke Kawaguchi d5c2470370 Merge branch 'pull-152'
Conflicts:
	core/src/main/java/hudson/model/DependencyGraph.java
2011-06-07 10:44:49 -07:00
Vojtech Juranek 844c49c144 Add warning for user and replaced fixEmpty() by standad Util.fixEmptyAndTrim() 2011-06-07 10:09:16 -07:00
Vojtech Juranek 8b4f30a162 Possible fix for JENKINS-9806, fix empty customWorkspace -if empry, replace it by null (i.e. no custom workspace) 2011-06-07 10:09:16 -07:00
Kohsuke Kawaguchi 9d89b9f983 Put this in a block tag so that it gets separated from summaries from
properties.
2011-06-07 10:04:16 -07:00
Olaf Lenz 12c3d20711 Put User Id before Name in user list. 2011-06-07 10:01:48 -07:00
Olaf Lenz dfba2f4985 Added user id column to securityRealm's list of users. 2011-06-07 10:01:47 -07:00
Olaf Lenz efa2ce74e7 Added column with user id to list of users. 2011-06-07 10:01:47 -07:00
Olaf Lenz cbe3941d54 Include output of the User Id to the User's page. 2011-06-07 10:01:47 -07:00
Stefan Wolf 8910df0326 Made DependencyGroup private in DependencyGraph and not an instance of
Dependency
2011-06-07 09:51:41 -07:00
Stephen Connolly 0208244f9f fix author tag 2011-06-07 09:36:33 -07:00
Stephen Connolly fdddf5e2f8 replace old CDDL+GPLv2 Version Number comparator with one that is both ASL and has a better understanding of Maven version numbers (with some tweaks for wildcard support)
o Had to change the logic of two test cases (2.0 is now newer than 2.0.ea and 1.12-SNAPSHOT is no longer equal to 1.11.*) both of which make more sense than the original test cases

o Should now allow custom builds with text/alpha qualifiers in the version number.
2011-06-07 09:36:12 -07:00
Stephen Connolly 4f569c8a39 fix author tag 2011-06-07 17:16:44 +01:00
Stephen Connolly 36774c254f replace old CDDL+GPLv2 Version Number comparator with one that is both ASL and has a better understanding of Maven version numbers (with some tweaks for wildcard support)
o Had to change the logic of two test cases (2.0 is now newer than 2.0.ea and 1.12-SNAPSHOT is no longer equal to 1.11.*) both of which make more sense than the original test cases

o Should now allow custom builds with text/alpha qualifiers in the version number.
2011-06-07 17:11:47 +01:00
Nigel Magnay dbe586ce92 Merge remote branch 'origin/master' into momo
* origin/master: (28 commits)
  Need to run install during prepare, or else the release:perform fails miserably.
  Enabled more convenient access to the XSTREAM field
  added a method to help plugins rename classes and still keep backward compatibility
  Rely on released versions
  Test files accidentally crept in.
  modified to use the type-safe tag lib interface.
  Hooking the taglib interface generation.
  [JENKINS-9326] add integration tests with eclipse tycho relocation
  experimenting with the taglib interface generator
  fixed NPE
  Converted a few more pages into Groovy to test the behaviour. Allow global.jelly to be written in Groovy.
  Jenkins
  auto-completes instance and descriptor
  Support global.groovy as well as config.groovy
  A few more Jelly files switched to Groovy as a test
  Looks like a dead code.
  added DSLD for Eclipse
  1.166 shipped
  not specifying the file extension so that different pieces can be implemented by different view technologies
  replaced i18n by '_' since it shows up a lot.
  ...

Conflicts:
	core/src/main/java/hudson/model/Hudson.java
2011-06-07 09:42:28 +01:00
Nigel Magnay 79eb909b11 Some of the configuration variables use Jenkins/Hudson.class to get
the root name of a system property. Obviously changing the root class
name breaks this. So introduce a simple Configuration class that is
used to first try Jenkins variables, then back off to Hudson variables
if not found.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-06-07 09:06:54 +01:00
Nigel Magnay 2adef6719a Merge remote branch 'origin/master' into momo
* origin/master: (91 commits)
  Parsing can happen in the forked Maven process. Support remoting.
  Fixed the test failures.
  Strip whitespace on maven installation.
  updated ja.
  Use relative path to validate new view name (in order to allow ViewGroups like NestedView to override)
  Added i18n.
  moved to the model package to colocate with the Result class, since I don't think this class is tied by itself to the notification.
  doc improvements
  enum to describe a result trend - i.e. change from the previous to the current result
  Recording the previous change.
  Do not include trailing periods in console links.
  doc improvements
  Added a hook to customize the XML parser behaviour.
  - Renamed from 'linked' to 'base' - Fixed the bug where multi-level base setting wasn't working properly - Improved docs
  Updated style
  Added convenience method for getting configuration run
  Initial commit
  the trunk is toward 1.416-SNAPSHOT
  creating an RC branch
  updated changelog as a part of the release
  ...

Conflicts:
	core/src/main/java/hudson/slaves/NodeProvisioner.java
	maven-plugin/src/main/java/hudson/maven/MavenModule.java
	maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
2011-06-07 09:04:40 +01:00
Kohsuke Kawaguchi b1db233fa2 Enabled more convenient access to the XSTREAM field 2011-06-06 18:26:22 -07:00
Kohsuke Kawaguchi 0007bab4d3 added a method to help plugins rename classes and still keep backward compatibility 2011-06-06 18:26:22 -07:00
Kohsuke Kawaguchi 5abc651cee Merge branch 'groovy-view'
Conflicts:
	core/src/main/java/hudson/ExtensionComponent.java
	core/src/main/resources/hudson/PluginManager/sidepanel.jelly
2011-06-06 17:13:48 -07:00
Kohsuke Kawaguchi 77290b9c98 Rely on released versions 2011-06-06 16:17:49 -07:00
Kohsuke Kawaguchi c1f0dfd718 Test files accidentally crept in. 2011-06-06 14:10:47 -07:00
Kohsuke Kawaguchi 4d9283c541 modified to use the type-safe tag lib interface. 2011-06-06 14:10:25 -07:00
Kohsuke Kawaguchi 7f50fbb14e Hooking the taglib interface generation. 2011-06-06 13:46:49 -07:00
Kohsuke Kawaguchi 5542f28bca fixed NPE 2011-06-06 12:43:02 -07:00
Kohsuke Kawaguchi a557e80d1a Converted a few more pages into Groovy to test the behaviour. Allow global.jelly to be written in Groovy. 2011-06-06 12:43:02 -07:00
Kohsuke Kawaguchi ca9c4e06aa Jenkins 2011-06-06 12:42:07 -07:00
Kohsuke Kawaguchi 1e35352b7e auto-completes instance and descriptor 2011-06-06 12:42:07 -07:00
Kohsuke Kawaguchi d41d9ff777 As Dean pointed out, this was an incompatible change.
This reverts commit 0cab76ae1f.
2011-06-06 12:38:43 -07:00
Olivier Lamy d9e6602194 Merge pull request #150 from happygiraffe/master
Fix whitespace in maven installation
2011-06-06 00:14:41 -07:00
Kohsuke Kawaguchi 2ff3cabba2 Parsing can happen in the forked Maven process. Support remoting. 2011-06-05 16:15:43 -07:00
Kohsuke Kawaguchi 5da00d03b4 Fixed the test failures. 2011-06-05 14:47:38 -07:00
Dominic Mitchell e4a846d3b5 Strip whitespace on maven installation. 2011-06-05 13:09:46 -07:00
Seiji Sogabe 0c6144ca5b updated ja. 2011-06-05 23:45:50 +09:00
Vincent Latombe 114c566be8 Use relative path to validate new view name (in order to allow
ViewGroups like NestedView to override)
2011-06-05 05:58:07 -07:00
Kohsuke Kawaguchi fa5686cd76 Added i18n.
I think we use the word 'description' elsewhere inside Jenkins to refer to human-readable text (like job description), so I'm making description the localized string. I'm assuming Kutzi has some use for all upper-case ID, yet the notion of 'upper case' only makes sense in some locale (for example not in Chinese), so I'm now calling it ID and I'm deriving it from the English localization.
2011-06-05 05:55:22 -07:00
Kohsuke Kawaguchi 06a9538363 moved to the model package to colocate with the Result class, since I don't think this class is tied by itself to the notification. 2011-06-05 05:49:31 -07:00
Kohsuke Kawaguchi 2917003a7a doc improvements 2011-06-05 05:48:27 -07:00
Christoph Kutzinski b547665ba2 enum to describe a result trend - i.e. change from the previous to the current result 2011-06-05 05:45:36 -07:00
Greg Heartsfield f99e3160ac Do not include trailing periods in console links.
This creates incorrect links in output from the svn-tag plugin.
2011-06-05 05:42:42 -07:00
Kohsuke Kawaguchi 7c56007de0 doc improvements 2011-06-05 05:15:57 -07:00
Kohsuke Kawaguchi bdf13dce4d Added a hook to customize the XML parser behaviour. 2011-06-05 05:12:22 -07:00
Kohsuke Kawaguchi 18496c5404 - Renamed from 'linked' to 'base'
- Fixed the bug where multi-level base setting wasn't working properly
- Improved docs
2011-06-04 15:46:53 -07:00
Christian Wolfgang 5444b16206 Updated style 2011-06-04 15:33:40 -07:00
Christian Wolfgang 34e884dc05 Added convenience method for getting configuration run 2011-06-04 15:33:40 -07:00
Christian Wolfgang d7b6277f32 Initial commit 2011-06-04 15:33:40 -07:00
Kohsuke Kawaguchi 82a26a579a the trunk is toward 1.416-SNAPSHOT 2011-06-04 11:24:56 -07:00
Seiji Sogabe eb0c005a3b Updated ja. 2011-06-04 02:32:37 +09:00
Stephen Connolly bfb7bd4ba4 When there are absolutely no executors for a specific label, there was an unnecessary delay in provisioning the first node for that label 2011-06-03 16:15:24 +01:00
Stephen Connolly 902cc4e1dd Added an extension point to allow prodding the NodeProvisioner into taking action faster than it might usually. 2011-06-03 16:10:18 +01:00