Commit Graph
745 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 40ffd566a2 Merge branch 'rc'
Conflicts:
	war/pom.xml
2011-06-17 22:12:34 -07:00
Kohsuke Kawaguchi 5dddebcf94 Corrected backward incompatible signature changes in 70c1065814. 2011-06-17 22:01:45 -07:00
Kohsuke Kawaguchi cce1364f0b making View more reusable outside the top-level Jenkins object 2011-06-17 15:21:35 -07:00
Kohsuke Kawaguchi a3354b12cf [FIXED JENKINS-9203] in light of 9c965617b3, I think the proper fix is to define a mechanism to abort with status. 2011-06-17 11:26:46 -07:00
Kohsuke Kawaguchi 112e4f7d0b form should have a name for programmatic clients 2011-06-13 21:32:08 -07:00
Kohsuke Kawaguchi e73e870fdc added a switch to verify the presence of the Jelly PI 2011-06-10 08:07:39 -07:00
Christoph Kutzinski 5f53febe9b [FIXED JENKINS-7577] NPE in site generation when building a single Maven module 2011-06-09 22:22:28 +02: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 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
Olivier Lamy 5ea48db3d2 [JENKINS-9326] add integration tests with eclipse tycho relocation 2011-06-06 22:22:50 +02:00
Kohsuke Kawaguchi 5da00d03b4 Fixed the test failures. 2011-06-05 14:47:38 -07:00
Nigel Magnay 017e445686 Move hudson.model.Jenkins to be jenkins.model.Jenkins - part III
Fix code that accesses functionality though package protected interfaces;
- access through AbstractCIBase
- make FullDuplexHttpChannel and OverallLoadStatistics public

Test case utility function for adjusting the quiet period variable

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:06:43 +01:00
Nigel Magnay 5679d019ec Move hudson.model.Jenkins to be jenkins.model.Jenkins - part II
Just import changes, from hudson.model.Jenkins -> jenkins.model.Jenkins,
and Javadoc comments.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:06:28 +01:00
Nigel Magnay 70c1065814 Stage 1 : Create hudson.model.Jenkins, make Hudson derive from Jenkins.
Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:00:58 +01:00
Andrew Bayer c0628ee2e5 Removing unneeded imports 2011-05-23 11:20:49 -07:00
Christoph Kutzinski 819c8528de implemented getDescriptor() to - hopefully - fix the AssertionError in the tests 2011-05-22 21:10:37 +02:00
Andrew Bayer ee8de0f903 Merge pull request #122 from bap2000/master
Add a default attribute to repeatableProperty and repeatable jelly tags
2011-05-19 17:05:49 -07:00
Kohsuke Kawaguchi 642f3011f9 The getRun method behaviour changed slightly. 2011-05-16 14:59:50 -07:00
bap2000 8578e5801f Add @default for repeatable and repeatableProperty jelly tags 2011-05-14 17:20:33 +01:00
Kohsuke Kawaguchi 5b03fb003c Don't let the debug option in Maven to block Mavens forked from tests 2011-05-11 21:46:49 -07:00
Kohsuke Kawaguchi 5368b7e0d1 Some of our tags, such as <optionalBlock> and <dropdownList> involves grouping of sibling table rows, and controlling visibility of them. So when such tags nest to each other, the visibility updates need to be done carefully, or else the visibility could get out of sync with the model (imagine outer group is made visible while inner group is not visible --- if all the rows are simply enumerated and visibility changed, we end up making the inner group visible.)
The rowVisibilityGroup object in hudson-behavior.js is used to coordinate this activity, and this test ensures that it's working.
2011-04-26 17:46:24 -07:00
Kohsuke Kawaguchi 8d29f4772b Some of our tags, such as <optionalBlock> and <dropdownList> involves grouping of sibling table rows, and controlling visibility of them. So when such tags nest to each other, the visibility updates need to be done carefully, or else the visibility could get out of sync with the model (imagine outer group is made visible while inner group is not visible --- if all the rows are simply enumerated and visibility changed, we end up making the inner group visible.)
The rowVisibilityGroup object in hudson-behavior.js is used to coordinate this activity, and this test ensures that it's working.
2011-04-26 17:39:56 -07:00
alanharder be673713e4 [JENKINS-9248] Add active configurations in remote API for matrix projects. 2011-04-25 20:42:01 -07:00
Chris Cosby 677033863f Change new inferRootDN argument to false for test 2011-04-25 15:02:24 -07:00
Chris Cosby 9d43b581fd Add inhibitInferRootDN to LDAP module. This allows rootDN to be blank, import for some broken AD servers accessed via LDAP. 2011-04-25 15:02:24 -07:00
Kohsuke Kawaguchi 677ca0fbea Use a bigger buffer as Stapler traces can get pretty large on deeply nested URL 2011-04-21 20:08:59 -07:00
Kohsuke Kawaguchi 3614868694 Merge branch 'oss'
Conflicts:
	core/src/main/java/hudson/Functions.java
	core/src/main/java/hudson/model/AutoCompletionCandidates.java
	core/src/main/java/hudson/model/ViewDescriptor.java
	core/src/main/resources/lib/hudson/3rdPartyLicenses.jelly
	core/src/main/resources/lib/hudson/newFromList/form.jelly
	core/src/main/resources/lib/hudson/projectViewRow.jelly
	core/src/main/resources/lib/hudson/thirdPartyLicenses.jelly
	core/src/main/resources/lib/layout/renderOnDemand.jelly
	core/src/test/java/hudson/FilePathTest.java
	test/src/test/resources/lib/layout/RenderOnDemandTest/testBehaviour.jelly
	test/src/test/resources/scripts/BehaviorTest/testCssSelectors.jelly
	ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/JavaScriptProxy/index.jelly
2011-04-21 15:37:31 -07:00
Kohsuke Kawaguchi f5209cd4de More aggressive search for data-bound beans. 2011-04-21 15:21:33 -07:00
Kohsuke Kawaguchi 9b7b199e85 handle optional dependency more gracefully 2011-04-21 13:53:31 -07:00
Kohsuke Kawaguchi 0d0e011d7e Jenkins 2011-04-21 13:53:31 -07:00
Kohsuke Kawaguchi 779914c879 improved the test to verify that the element order is preserved during insertion. 2011-04-21 13:39:48 -07:00
Kohsuke Kawaguchi a452cb6b3b added a test case to verify that behaviours apply to the inserted fragments 2011-04-21 13:39:47 -07:00
Kohsuke Kawaguchi 40238d6f74 doc improvement 2011-04-21 13:39:47 -07:00
Kohsuke Kawaguchi daebc2f6b7 and more test 2011-04-21 13:39:47 -07:00
Kohsuke Kawaguchi feac206768 another test 2011-04-21 13:39:47 -07:00
Kohsuke Kawaguchi 633aefbbe2 adding inclusive/exclusive selector tests 2011-04-21 13:39:46 -07:00
Kohsuke Kawaguchi e23068808a [FIXED JENKINS-9367] persistence problem in View$PropertyList 2011-04-19 19:08:15 -07:00
Stephen Connolly d68e3ba2c5 Tsk Tsk! Kohsuke you missed a possible NPE for people running hpi:run on plugins in fixing [JENKINS-6545] 2011-04-19 16:27:45 -07:00
Kohsuke Kawaguchi c83d119613 [FIXED JENKINS-8579] defined a mechanism to replace some of the key UI text.
I wasn't initially planning to do this, but it turns out more people needed this feature than I thought.

I left the text as is, but defined a mechanism to override this in the plugin, in a possibly context sensitive way. For example, a plugin can replace this text on a job-by-job basis, or by looking at some property/builder/etc.
2011-04-19 14:50:10 -07:00
Olivier Lamy d678144241 cleanup and add javadoc 2011-04-18 21:47:05 +02:00
Olivier Lamy c2642228d3 missed to add unit test project file 2011-04-18 21:44:59 +02:00
Olivier Lamy e4914db591 [FIXED JENKINS-9326] Jenkins Maven build does not recognize Tycho surfire reports 2011-04-18 21:43:50 +02:00
Kohsuke Kawaguchi dfc2fe3895 [FIXED JENKINS-9367] persistence problem in View$PropertyList 2011-04-18 09:42:18 -07:00
Kohsuke Kawaguchi 70613748db merged back the RC branch
Conflicts:
	core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly
2011-04-15 21:25:37 -07:00
Kohsuke Kawaguchi 6a2dad3134 Merged ff1f60905e
Conflicts:
	changelog.html
	pom.xml
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
2011-04-15 15:00:15 -07:00
Kohsuke Kawaguchi f105becb14 added another convenience method 2011-04-15 14:55:43 -07:00
alanharder 2c767feea1 [JENKINS-9293] Add test that project-level permissions of a matrix project
apply to child configurations as well.
2011-04-14 08:29:13 -07:00
Kohsuke Kawaguchi e761d80f4d [FIXED JENKINS-4617]
this and the previous commit constitutes the fix.
Also added a test case.
2011-04-12 19:16:53 -07:00
Kohsuke Kawaguchi 7cb015e10c Added two new CLI commands, inspired by pull-91. 2011-04-12 18:06:52 -07:00
Kohsuke Kawaguchi 8f62f7e479 test case for the HTML escaping 2011-04-12 12:37:12 -07:00