Commit Graph

10499 Commits (7253bb334c718c33ec6a32b2d7e011b41e22a461)
 

Author SHA1 Message Date
Andy Wilkinson 69320180d9 Make FileSystemWatcherTests.waitsForPollingInterval more robust
The intent of the test is to:

1. Make a change
2. Sleep for long enough for that change to be picked up
3. Make another change
4. Stop that watcher after 1 further scan has been performed
5. Assert that a further scan was performed by checking that two
   separate sets of changes (step 1 and step 3) have been picked up

Previously, step 2 relied on simply sleeping for a period of time
longer than the polling interval. In reality, the polling interval
is only a minimum time between scans and the actual time between them
depends on thread scheduling, GC pauses, etc. This lead to the
test failing intermittently if the scan didn't happen in a timely
manner.

This commit removes the sleep and replaces it with a while loop that
waits for first change to be picked up. This ensures that the second
change will be detected separately from the first and that two
separate change sets should always be available once the watcher has
stopped.

See gh-7782
8 years ago
Stephane Nicoll f4f5a70cb2 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 5b7292212f Merge pull request #8001 from kazuki43zoo:improve-log
* pr/8001:
  Prevent unnecessary debug log message creation
8 years ago
Kazuki Shimizu bd6ae47d68 Prevent unnecessary debug log message creation
Closes gh-8001
8 years ago
Stephane Nicoll 75438ff1a9 Merge pull request #8004 from izeye:polish-20170117
* pr/8004:
  Polish contribution
  Polish
8 years ago
Stephane Nicoll d556e82cf7 Polish contribution
Closes gh-8004
8 years ago
Johnny Lim acc36c076d Polish
See gh-8004
8 years ago
Andy Wilkinson 8f201d6de5 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 69e7e31b1c Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 7c2664f959 Ensure that jar entry names use forward slashes, even on Windows
Previously, in the DevTools integration tests, portions of a File's
path were used to create the name of a jar entry. On Windows this
resulted in the entry containing \ characters. As a result the
directory structure was incorrect and the classes could not be loaded
from the jar.

This commit ensures that any \ characters are replaced with /
characters.

See gh-7782
8 years ago
Stephane Nicoll 7f16a36c59 Merge branch '1.5.x' 8 years ago
Stephane Nicoll a5d67b9be8 Upgrade to Git Commit ID Plugin 2.2.2
Closes gh-7980
8 years ago
Stephane Nicoll f714b1d4be Merge branch '1.5.x' 8 years ago
Stephane Nicoll ada441bccc Allow custom override of user info OAuth2RestTemplate
Closes gh-5996
8 years ago
Andy Wilkinson 9a4b6a90ae Merge branch '1.5.x' 8 years ago
Andy Wilkinson f72799186e Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson a72365e1a2 Expose context hierarchy in beans endpoint
Previously, the beans endpoint would only expose the context that
contained the endpoint. This commit updates the endpoint so that
the context that contains the endpoint and all of its ancestors are
exposed.

In a context hierarhcy, the relation ship is child -> parent and there
is no way to navigate from a parent to a child. As a result, any
contexts that are descendants of the context containing the endpoint
are not exposed.

Closes gh-5188
8 years ago
Stephane Nicoll a9399639a0 Merge branch '1.5.x' 8 years ago
Stephane Nicoll ad77b655aa Merge pull request #7905 from eddumelendez:ldap_actuator
* pr/7905:
  Polish contribution
  Add LDAP health actuator
8 years ago
Stephane Nicoll 8bef0a1e60 Polish contribution
Closes gh-7905
8 years ago
Eddú Meléndez b2250f4ad8 Add LDAP health actuator
Provide specific health actuator endpoint to verify if LDAP connection
is valid.

See gh-7905
8 years ago
Stephane Nicoll 85c66aedb7 Merge branch '1.5.x' 8 years ago
Stephane Nicoll db99ed843e Remove LDAP 3rd party starter reference
Spring Boot provides now a LDAP starter based on this work so this
reference is no longer needed.
8 years ago
Stephane Nicoll c72e61cbcd Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll dbee44a6b5 Merge pull request #7997 from slaskawi:ISPN-6561/Infinispan_starters
* pr/7997:
  Add Infinispan starter reference
8 years ago
Sebastian Laskawiec 16de86f917 Add Infinispan starter reference
Closes gh-7997
8 years ago
Stephane Nicoll 87cf236aae Merge branch '1.5.x' 8 years ago
Stephane Nicoll 3e05329fd7 Order internal RepositoryRestConfigurer
This commit provides an order of zero for the RepositoryRestConfigurer
that is used internally to configure the `RepositoryRestConfiguration`. In
practice, an unordered `RepositoryRestConfigurer` will run after ours.

Closes gh-7981
8 years ago
Stephane Nicoll d271b54f63 Merge branch '1.5.x' 8 years ago
Stephane Nicoll ddf1408679 Merge pull request #7995 from vpavic:improve-logging
* pr/7995:
  Improve `UserInfoTokenServices` logging
8 years ago
Vedran Pavic 8f6a0e96fd Improve `UserInfoTokenServices` logging
Closes gh-7995
8 years ago
Andy Wilkinson d477223d77 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 89e3335ca1 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 7f492a56c2 Merge pull request #4902 from Karsten Sperling
* gh-4902:
  Test that double registration of ServletContextInitializers does not happen
  Avoid double-reg when a Servlet or Filter implements ServletContextInitializer
8 years ago
Andy Wilkinson 5158f6e5fc Test that double registration of ServletContextInitializers does not happen
Closes gh-4902
8 years ago
Karsten Sperling 600e74b6c9 Avoid double-reg when a Servlet or Filter implements ServletContextInitializer
See gh-4902
8 years ago
Stephane Nicoll cf30703fbe Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6064eda6c6 Merge pull request #7994 from vpavic:fix-docs
* pr/7994:
  Fix Neo4j session documentation
8 years ago
Vedran Pavic caa9cdcc02 Fix Neo4j session documentation
Closes gh-7994
8 years ago
Stephane Nicoll c04fd325f1 Merge pull request #7993 from vpavic:gh-7944
* pr/7993:
  Document use of `OpenEntityManagerInViewInterceptor`
8 years ago
Vedran Pavic a7fce6b048 Document use of `OpenEntityManagerInViewInterceptor`
Closes gh-7993
8 years ago
Stephane Nicoll e4876eb666 Merge branch '1.5.x' 8 years ago
Stephane Nicoll de912c4c50 Merge pull request #7914 from kazuki43zoo:allow-lowercase-on-logger-endpoint
* pr/7914:
  Polish contribution
  Allow lowercase logger level on MVC endpoint
8 years ago
Stephane Nicoll f21c767356 Polish contribution
Closes gh-7914
8 years ago
Kazuki Shimizu a6756c9ed3 Allow lowercase logger level on MVC endpoint
See gh-7914
8 years ago
Stephane Nicoll 752a91c75b Merge branch '1.5.x' 8 years ago
Stephane Nicoll de1d450af7 Merge pull request #7916 from pravsingh:readmeFix
* pr/7916:
  Polish contribution
  Polish samples list in readme
8 years ago
Stephane Nicoll 7e557662a5 Polish contribution
Closes gh-7916
8 years ago
Praveendra Singh 36de58f0fe Polish samples list in readme
See gh-7916
8 years ago
Andy Wilkinson 1d589fc55a Merge branch '1.5.x' 8 years ago