Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-21 22:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,404 Commits 55 Branches 466 Tags
Commit Graph

7404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Becker
000793a7aa 416940 avoid download of spring-beans.dtd 2013-09-17 12:40:23 +02:00
Thomas Becker
257e1a9f2e 416674 run all jetty-ant tests on random ports 2013-09-16 18:05:31 +02:00
Greg Wilkins
ea22c21281 Merge remote-tracking branch 'origin/jetty-8' 2013-09-16 23:35:27 +10:00
Greg Wilkins
4ae547b988 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-16 23:31:09 +10:00
Greg Wilkins
30bab30d9b Revert "Merge branch 'release-8' into jetty-8" 
This reverts commit 463ef68dc32c1733d805f85c86c7adb8c488a6be, reversing
changes made to de544ddfbfd36dfa24cf127a521b00e674b2dbfc.
 2013-09-16 23:28:59 +10:00
Greg Wilkins
2629f93397 Revert "Merge branch 'release-7' into jetty-7" 
This reverts commit 624a0d7e455330836ed8b99c39a1686cd1210869, reversing
changes made to 3eb84f99a45d81acf55deb1c12be9ac9b6042d1f.

Conflicts:
	VERSION.txt
 2013-09-16 23:23:59 +10:00
Greg Wilkins
0e2f3990b1 reset VERSION.txt 2013-09-16 20:12:50 +10:00
Greg Wilkins
05d039b426 413684 deprecated unsafe alias checkers 
removed debugs
 2013-09-16 19:30:59 +10:00
Greg Wilkins
a731ec13c8 413684 deprecated unsafe alias checkers 2013-09-16 19:30:45 +10:00
Greg Wilkins
9fef8215ed 417225 added Container.addEventListener method 2013-09-16 10:48:51 +10:00
Greg Wilkins
9113767907 417260 Protected targets matched as true URI path segments 2013-09-16 10:07:59 +10:00
Thomas Becker
624a0d7e45 Merge branch 'release-7' into jetty-7 2013-09-13 18:06:06 +02:00
Thomas Becker
463ef68dc3 Merge branch 'release-8' into jetty-8 2013-09-13 18:05:14 +02:00
Jan Bartel
0b80b9ba36 417110 Demo / html body end tag missing in authfail.html 2013-09-13 12:13:47 +10:00
Greg Wilkins
0e981d8d98 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-monitor/src/test/java/org/eclipse/jetty/monitor/AttrEventTriggerTest.java
 2013-09-12 15:07:02 +10:00
Greg Wilkins
423dc1e443 416990 JMX names statically unique 
Concurrent access to counter
 2013-09-12 12:52:28 +10:00
Greg Wilkins
4d1c7ed28d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-09-12 12:50:57 +10:00
Jan Bartel
0abeb876dc Update start.ini to handle different versions of npn boot jar 2013-09-12 12:37:50 +10:00
Greg Wilkins
de544ddfbf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-12 12:30:03 +10:00
Greg Wilkins
3eb84f99a4 416990 JMX names statically unique 
Fixed monitor test to reset uniqueness
 2013-09-12 12:29:24 +10:00
Greg Wilkins
e4035f8cf2 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
 2013-09-12 11:08:03 +10:00
Greg Wilkins
da2bbdea3c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-12 10:40:54 +10:00
Greg Wilkins
c842c5c505 416990 JMX names statically unique 2013-09-12 10:40:26 +10:00
Jan Bartel
be2ecca599 Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi) 2013-09-12 10:06:01 +10:00
Thomas Becker
5ab692b62e Updating VERSION.txt top section 2013-09-11 12:26:24 +02:00
Simone Bordet
9910db17cb Added profile for JDK 1.7.0_40. 2013-09-11 09:15:39 +02:00
Thomas Becker
b95d6948a8 [maven-release-plugin] prepare for next development iteration 2013-09-10 20:44:44 +02:00
Thomas Becker
5692cff532 [maven-release-plugin] prepare release jetty-8.1.13.v20130910 jetty-8.1.13.v20130910 2013-09-10 20:44:29 +02:00
Thomas Becker
2bffdf508c Merge branch 'release-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into release-8 2013-09-10 19:56:12 +02:00
Thomas Becker
911043b5be ProxyServletTest create test dir if it doesn't exist 2013-09-10 18:02:46 +02:00
Thomas Becker
8fd97dad0e Updating VERSION.txt top section 2013-09-10 17:42:53 +02:00
Thomas Becker
994d8baa3f Merge branch 'jetty-8' into release-8 2013-09-10 17:40:25 +02:00
Thomas Becker
d6d6b53ee8 Updating VERSION.txt top section 2013-09-10 17:33:51 +02:00
Thomas Becker
ed0bbaa166 [maven-release-plugin] prepare for next development iteration 2013-09-10 16:19:10 +02:00
Thomas Becker
3d78c02add [maven-release-plugin] prepare release jetty-7.6.13.v20130910 jetty-7.6.13.v20130910 2013-09-10 16:18:55 +02:00
Thomas Becker
0e3e02f6f9 Updating VERSION.txt top section 2013-09-10 15:34:12 +02:00
Thomas Becker
262019a5e1 Merge branch 'jetty-7' into release-7 2013-09-10 15:33:19 +02:00
Thomas Becker
9db0101d69 ProxyServletTest create test dir if it doesn't exist 2013-09-10 12:03:03 +02:00
Jan Bartel
f85acc7437 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
 2013-09-10 09:48:09 +10:00
Jan Bartel
ab9ecd277d 416266 HttpServletResponse.encodeURL() encodes on first request when only SessionTrackingMode.COOKIE is used 2013-09-10 08:57:59 +10:00
Greg Wilkins
8c0f6328a1 415401 Add initalizeDefaults call to SpringConfigurationProcessor 
remove deprecated XmlBeansFactory usage
 2013-09-09 18:01:03 +10:00
Thomas Becker
5d21e4246b 415401 WebAppProvider: override XmlConfiguration.initializeDefaults 2013-09-09 09:49:08 +02:00
Greg Wilkins
e2e1b47edf 416015 Handle null Accept-Language and other headers 2013-09-09 16:51:37 +10:00
Mikhail Mazursky
767faece5c [Bug 415999] Fix some of FindBugs warnings 
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-09-09 00:24:31 -04:00
Jan Bartel
cdd95bb551 Merge remote-tracking branch 'origin/jetty-8' 2013-09-09 12:42:56 +10:00
Jan Bartel
11085742c8 416787 StringIndexOutOfBounds with a pathMap of "" 2013-09-09 12:41:28 +10:00
Thomas Becker
1f765bf9ae Merge branch 'XmlConfiguration' 2013-09-06 12:24:05 +02:00
Thomas Becker
77889089a9 415401 Add initalizeDefaults call to SpringConfigurationProcessor 2013-09-06 12:23:42 +02:00
Jan Bartel
27b977f57d 416679 Change warning to debug if no transaction manager present 2013-09-06 15:32:38 +10:00
Greg Wilkins
9e90e1267f fixed bad merge 2013-09-06 09:47:36 +10:00