Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-03 03:25:28 -04:00
Code Issues Projects Releases Wiki Activity
657 Commits 23 Branches 40 Tags
Commit Graph

56 Commits

Author SHA1 Message Date
Shihab Uddin
e14cbbd853 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	pom.xml
 2015-03-30 13:53:30 +02:00
Harald Kuhr
6dd68dd54e [maven-release-plugin] prepare for next development iteration 2014-10-01 11:21:42 +02:00
Harald Kuhr
d054ee9bb1 [maven-release-plugin] prepare release twelvemonkeys-3.0 2014-10-01 11:21:34 +02:00
Harald Kuhr
845944b25f [maven-release-plugin] prepare for next development iteration 2014-10-01 10:32:30 +02:00
Harald Kuhr
d12f9bdbbd [maven-release-plugin] prepare release twelvemonkeys-3.0-rc7 2014-10-01 10:32:23 +02:00
Harald Kuhr
3e9820bb22 Prepare for new development 2014-10-01 10:25:34 +02:00
Harald Kuhr
2098e6a898 [maven-release-plugin] prepare release twelvemonkeys-3.0-rc6 2014-10-01 10:19:06 +02:00
Harald Kuhr
feb20eefdd [maven-release-plugin] prepare for next development iteration 2014-09-30 12:48:20 +02:00
Harald Kuhr
6977e52059 [maven-release-plugin] prepare release twelvemonkeys-3.0-rc6 2014-09-30 12:48:12 +02:00
Rune Bremnes
113480b9e7 Merge branch 'master' of https://github.com/haraldk/TwelveMonkeys 
Conflicts:
	imageio/imageio-reference/pom.xml
	imageio/imageio-thumbsdb/pom.xml
 2014-03-03 12:33:01 +01: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
Trygve Laugstøl
0ab9294004 [maven-release-plugin] prepare for next development iteration 2014-02-15 13:14:41 +01:00
Trygve Laugstøl
ed5a5e0dca [maven-release-plugin] prepare release twelvemonkeys-3.0-rc5 2014-02-15 13:13:39 +01:00
Harald Kuhr
14e12eb2c1 TMS-29: Code clean up after merge. 2014-01-02 13:25:37 +01:00
Harald Kuhr
0ded2f211a TMS-29: Test case exposing .ConcurrentModificationException. 2014-01-02 13:21:37 +01:00
Harald Kuhr
ed11259e58 Merge branch 'master' of github.com:haraldk/TwelveMonkeys 2014-01-02 13:18:58 +01:00
Harald Kuhr
5779a40a32 TMS-29: Test case exposing .ConcurrentModificationException. 2014-01-02 13:16:26 +01:00
Andreas Kohn
ecc08daa2d Call #deregisterServiceProvider() outside of the iteration over the existing service providers 2013-12-30 17:57:38 +01:00
Harald Kuhr
a1f9e979b9 Servlet changes for 3.0. 2013-12-23 11:11:48 +01:00
Harald Kuhr
cd6e9ebbf5 TMS: Updated POM with new build-plugin version. 2013-09-08 14:43:51 +02:00
Harald Kuhr
2f69847b23 Moved old obsolete stuff to sandbox. 2013-09-08 14:16:31 +02: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
justwrote
0860db2166 mockito should be a test dependency 2013-06-21 12:07:49 +02:00
Harald Kuhr
33ffc14e3f TMS-XXX: Code style. 2013-06-05 10:56:12 +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
d6e508662c Merge branch 'master' of https://github.com/haraldk/TwelveMonkeys 2012-09-26 11:17:30 +02:00
Harald Kuhr
7846f497af TMS: Moving old junk to sandbox. 2012-09-25 14:50:47 +02:00
Harald Kuhr
9ef8ac9930 Removed obsolete methods. 2012-06-21 16:59:04 +02:00
Harald Kuhr
75c09d3aef Now sets Vary header. Minor code clean up & fixes. 2012-06-21 10:55:14 +02:00
Harald Kuhr
4db12d313b Added init param annotation. 2012-06-21 10:50:45 +02:00
Harald Kuhr
3095422a44 Fixed code style. 2012-06-21 10:49:39 +02:00
Harald Kuhr
d84acbf4b3 A servlet for serving static files 2012-06-21 10:45:06 +02:00
Harald Kuhr
c7f6dedaa7 ContextListener for web app-local IIO providers. 2012-06-21 10:44:53 +02:00
Harald Kuhr
39dafd48ca POM-fix. 2012-02-03 16:30:08 +01: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
49f5ab8e64 Code clean-up. 2011-12-19 14:30:40 +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
0b23d9f6c2 Moving old servlet stuff to sandbox. 2011-12-14 10:12: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
b5b1b4f422 New code style, no functional changes. 2011-04-07 16:07:17 +02:00
Harald Kuhr
3f98534011 Fixed doc links. 2011-04-07 13:48:10 +02:00
Harald Kuhr
af7d5fa94a Various code clean-up. No functional changes. 2011-03-02 17:26:17 +01: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