35 Commits

Author SHA1 Message Date
Harald Kuhr
25f9cc5c55 Delete deprecated Servlet classes
(cherry picked from commit b0ad6b2a4b718eafe86d74977fc910d653e8a177)
2021-12-15 16:24:41 +01:00
Gauthier
5617b4323c
Make tests pass on JDK 16 and 17 (#635)
* make tests pass on JDK 16 and 17
replace deprecated mockito-all by mockito-core, and updated to latest 3.x
replace deprecated org.mockito.Matchers

* code cleanup from IDE suggestions

* add oracle jdk 16 and 17 to Travis
2021-10-26 18:38:33 +02:00
Harald Kuhr
c28963ae49 Minor servlet clean-up. 2021-09-21 14:23:59 +02:00
Harald Kuhr
94eac2d6e5 XXX: Remove another old servlet class. 2021-05-09 18:08:56 +02:00
Harald Kuhr
107da17ca9 Dependabot broke my build... 2020-10-13 19:16:58 +02:00
Harald Kuhr
24c6682236 #311 Updated license headers to be the same as in the LICENSE.txt 2018-08-18 19:22:52 +02:00
Harald Kuhr
c7208c2c97 Clean up after merge. 2016-08-09 09:32:58 +02:00
Torstein Krause Johansen
0db676f1be Re-added test case lost in large merge
- Removed imageio-jmagick (again)

- Removed internal Maven repo

- fixed line endings on a number of files to avoid a humongous merge
  diff when getting changes into upstream

- Re-enabled a few tests
2016-06-29 14:16:44 +02:00
Torstein Krause Johansen
1e3c8b26f6 Merge branch 'master' into madness 2016-06-28 14:18:30 +02:00
Rune Bremnes
cb276c8aff Merge branch 'master' of https://github.com/haraldk/TwelveMonkeys
Conflicts:
	sandbox/sandbox-common/src/main/java/com/twelvemonkeys/io/enc/DeflateEncoder.java
	sandbox/sandbox-common/src/main/java/com/twelvemonkeys/io/enc/InflateDecoder.java
	servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java
	servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java
	servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java
	servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java
	servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java
2014-02-24 10:28:26 +01:00
Harald Kuhr
0ded2f211a TMS-29: Test case exposing .ConcurrentModificationException. 2014-01-02 13:21:37 +01:00
Harald Kuhr
5779a40a32 TMS-29: Test case exposing .ConcurrentModificationException. 2014-01-02 13:16:26 +01:00
Harald Kuhr
a1f9e979b9 Servlet changes for 3.0. 2013-12-23 11:11:48 +01:00
Harald Kuhr
c5f1d8101b Moved old obsolete stuff to sandbox. 2013-09-08 14:08:38 +02:00
Rune Bremnes
c5929d9479 Merge remote-tracking branch 'upstream/master'
Conflicts:
	servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java
	servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigMapAdapterTest.java
	servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTest.java
	servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTest.java
2013-08-14 09:45:32 +02:00
Harald Kuhr
b97d95cca7 More Maven-friendly test suite. 2013-03-04 15:16:59 +01:00
Harald Kuhr
1ffe694538 TMS-XXXX: New map adapters for servlet context and request attributes + minor API tweaks. 2013-03-04 14:48:50 +01:00
Shihab Uddin
5bd8c37c2d fixed merge conflicts 2012-09-26 11:51:25 +02:00
Erlend Hamnaberg
2f06f2de6d Cleanup of AreaOfInterest
Conflicts:
	servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
2012-09-26 11:47:53 +02:00
Erlend Hamnaberg
8137165bac Cleanup of AreaOfInterest
- Extracted AreaOfInterest into an interface
- Added an AreaOfInterestFactory.
- Use AreaOfInterestFactory in ImageServletResponseImpl
- fixed version

Conflicts:
	servlet/pom.xml
	servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
2012-09-26 11:45:04 +02:00
Erlend Hamnaberg
be959ce3f3 Rule Of thirds:
- enable with system property
 - extracted AreaOfInterest into a separate class.

Conflicts:
	servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java
	servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
2012-09-26 11:40:42 +02:00
Shihab Uddin
d6e508662c Merge branch 'master' of https://github.com/haraldk/TwelveMonkeys 2012-09-26 11:17:30 +02:00
Harald Kuhr
d84acbf4b3 A servlet for serving static files 2012-06-21 10:45:06 +02:00
Harald Kuhr
5d6097baef Added test cases + workaround for some known issues with GIF encoding. 2011-12-20 12:45:41 +01:00
Harald Kuhr
0c4fc454b9 Major test-case cleanup.
- Removed JMock dependency, tests rewritten to use Mockito for stub/mock
- All test should now be using JUnit annotation-style tests
- All modules should now depend on same JUnit version
- Rewrote a few tests to better utilize JUnit annotations
- Fixed a few broken tests
- Code style changes
2011-12-19 14:28:34 +01:00
Harald Kuhr
cee29fb6a1 Major test overhaul part II, now uses JUnit 4 annotation style tests. 2011-10-18 20:28:06 +02:00
Harald Kuhr
9cafe4d9a9 Major test overhaul, now uses JUnit 4 annotation style tests. 2011-10-18 20:16:32 +02:00
Harald Kuhr
cb4a35016b Removed TODO. 2011-04-15 17:07:03 +02:00
Harald Kuhr
c6d6a86343 Expanded test cases, fixed a potential NPE. 2011-04-15 17:05:47 +02:00
Harald Kuhr
521c4e4bbc Added test case for ImageFilter + implemented changes suggested by Rune Bremnes. 2011-04-15 10:35:21 +02:00
Harald Kuhr
5bd896f80f New code style. No functional changes. 2011-02-17 16:53:08 +01:00
Harald Kuhr
1433a24052 New Servlet configurator. 2011-02-17 12:49:07 +01:00
Harald Kuhr
e468484d68 Clean-up, fxed typos etc. 2010-04-30 14:33:23 +02:00
Erlend Hamnaberg
0d8920aec4 Merge commit 'upstream/master'
Conflicts:
	imageio/imageio-reference/pom.xml
	imageio/imageio-thumbsdb/pom.xml
	servlet/pom.xml
2010-04-20 11:40:30 +02:00
Erlend Hamnaberg
3050899903 Renamed servlet to own groupId. Fixed naming of ImageIO 2010-02-07 19:17:13 +01:00