Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 16:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,699 Commits 55 Branches 466 Tags
Commit Graph

555 Commits

Author SHA1 Message Date
Jesse McConnell
cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell
5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
Jan Bartel
1fbe298bd6 374881 Set copyWebInf to false by default 2012-04-12 23:01:33 +10:00
Greg Wilkins
ee2d289f63 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-npn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
 2012-04-12 16:02:34 +10:00
Jan Bartel
f81ea12320 375709 Ensure resolveTempDirectory failure does not deadlock; improve error message 2012-04-11 12:37:51 +10:00
Jan Bartel
17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Jan Bartel
ef0d6d32f9 374881 Ensure setCopyWebInf(true) only copies WEB-INF if !setCopyWebDir(true) 2012-03-28 19:27:06 +11:00
Jan Bartel
83ce567e66 Add missing test from jetty-7 2012-03-15 09:53:12 +11:00
Jesse McConnell
b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell
7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jesse McConnell
246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell
a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Jesse McConnell
50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Jesse McConnell
d1c8c477ea [maven-release-plugin] prepare for next development iteration 2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f [maven-release-plugin] prepare release jetty-8.1.2.v20120302 2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e [maven-release-plugin] prepare for next development iteration 2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5 [maven-release-plugin] prepare release jetty-7.6.2.v20120302 2012-03-02 08:37:38 -06:00
Jesse McConnell
0731cbe64d Merge branch 'master' into jetty-8 2012-02-22 14:42:39 -06:00
Thomas Becker
8de385992e 372256: fix if clause doing an || instead of && and thus always calling instanceOf on null values 2012-02-22 14:42:11 -06:00
Jesse McConnell
ac79497dee [maven-release-plugin] prepare for next development iteration 2012-02-15 14:29:36 -06:00
Jesse McConnell
3705b424c8 [maven-release-plugin] prepare release jetty-8.1.1.v20120215 2012-02-15 14:29:28 -06:00
Jesse McConnell
efb6883cf0 [maven-release-plugin] prepare for next development iteration 2012-02-15 14:22:19 -06:00
Jesse McConnell
baf2b94f77 [maven-release-plugin] prepare release jetty-7.6.1.v20120215 2012-02-15 14:22:12 -06:00
Jesse McConnell
098428dd37 Merge branch 'master' into jetty-8 2012-02-15 13:49:23 -06:00
Greg Wilkins
c1bcec61d5 jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test 2012-02-07 11:32:00 +11:00
Joakim Erdfelt
9207423ca0 Fixing JDK5 build abort due to bad javadocs 2012-02-06 10:01:44 -07:00
Jesse McConnell
6e44f4db5f [maven-release-plugin] prepare for next development iteration 2012-01-27 08:15:45 -06:00
Jesse McConnell
9d1ca3593e [maven-release-plugin] prepare release jetty-8.1.0.v20120127 2012-01-27 08:15:38 -06:00
Jesse McConnell
ad6126553b [maven-release-plugin] prepare for next development iteration 2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05 [maven-release-plugin] prepare release jetty-7.6.0.v20120127 2012-01-27 08:13:00 -06:00
Jesse McConnell
f2d0fd3cc8 revert back to 8.1.0-SNAPSHOT 2012-01-26 10:45:06 -06:00
Jesse McConnell
7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell
e98ae91ca6 [maven-release-plugin] prepare for next development iteration 2012-01-25 11:16:11 -06:00
Jesse McConnell
fb30166a7f [maven-release-plugin] prepare release jetty-8.1.0.v20120125 2012-01-25 11:16:05 -06:00
Jesse McConnell
c918bb4e3c Merge branch 'master' into jetty-8 2012-01-25 10:31:44 -06:00
Jesse McConnell
0c96fc40ea [maven-release-plugin] prepare for next development iteration 2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 2012-01-25 09:30:55 -06:00
Greg Wilkins
ae5ddb2930 369216 turned off the shared resource cache 2012-01-23 14:31:25 +11:00
Jan Bartel
6e3c8094f1 368112 NPE on <jsp-config><taglib> element parsing web.xml 2012-01-09 11:07:41 +11:00
Jan Bartel
0dfc9feaf9 367383 jsp-config element must be returned for ServletContext.getJspConfigDescriptor 2011-12-22 19:30:01 +11:00
hmalphettes
89afbdf31d 360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6 2011-12-02 17:27:26 +08:00
Greg Wilkins
de005c68fd Revert "Merge branch 'release-8'" 
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
 2011-11-30 16:27:30 +11:00
Greg Wilkins
631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins
9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Jan Bartel
cbec18af60 364430 Support web.xml enabled state for servlets 2011-11-22 14:09:45 +11:00
Jan Bartel
837f8d33c4 364283 can't parse the servlet multipart-config for the web.xml 2011-11-22 12:17:07 +11:00
Jan Bartel
127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins
61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Jesse McConnell
d5320d95ba [maven-release-plugin] prepare for next development iteration 2011-10-24 15:02:30 -05:00