Joakim Erdfelt
12dbcadede
358649 - StdErrLog system properties for package/class logging LEVEL.
2011-10-06 12:04:44 -07:00
Jesse McConnell
b58006b4a4
[maven-release-plugin] prepare for next development iteration
2011-10-06 09:43:37 -05:00
Jesse McConnell
7eca345e8d
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 09:43:31 -05:00
Jesse McConnell
7958b033b0
Updating VERSION.txt top section
2011-10-06 09:22:28 -05:00
Jesse McConnell
4cdb50bd50
Merge branch 'master' into release
2011-10-06 09:21:15 -05:00
Jesse McConnell
decb4c7e8c
update update-version profile
2011-10-06 09:20:57 -05:00
Jesse McConnell
dd830aae17
Merge branch 'master' into release
2011-10-06 09:16:58 -05:00
Simone Bordet
ab1d0c203e
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-06 16:09:03 +02:00
Simone Bordet
e741b98510
360051 SocketConnectionTest.testServerClosedConnection is excluded.
...
Reworked StreamEndPoint methods isInputShutdown(), isOutputShutdown(), shutdownInput(), shutdownOutput(), and updated subclasses to call super where appropriate.
The test had to be modified to work properly with SocketConnector, because behavior is different from SelectConnector, but the CPU spinning is fixed.
2011-10-06 16:08:12 +02:00
Simone Bordet
8d61ce374b
Removed dead code.
2011-10-06 16:07:19 +02:00
Jesse McConnell
8a077ff38e
add versions to reporting plugins, they don't seem to inherit from plugin management
2011-10-06 08:24:58 -05:00
Jan Bartel
d862348b4c
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2011-10-06 18:31:57 +11:00
Jan Bartel
b533daa3e1
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-06 17:32:56 +11:00
Jan Bartel
a8f24a2b64
360066 jsps referenced in web.xml <jsp-file> elements do not compile
2011-10-06 17:32:31 +11:00
Greg Wilkins
ed9d9a0a33
javadoc
2011-10-06 16:39:14 +11:00
Greg Wilkins
76cdf9badb
357240 more half close refinements
2011-10-06 11:24:06 +11:00
Simone Bordet
12469af499
Fixed case where the http parser has received some but not all data, and suddenly reads -1.
2011-10-05 16:36:33 +02:00
Greg Wilkins
6abf426627
357240 half closed client test
2011-10-05 22:14:48 +11:00
Greg Wilkins
57d81603c4
cleanup debug output
2011-10-05 22:01:49 +11:00
Greg Wilkins
c6b3bab6d7
cleanup debug output
2011-10-05 21:41:01 +11:00
Greg Wilkins
f778867f32
357240 ensure half closed is not schedule with no progress
2011-10-05 14:48:47 +11:00
Greg Wilkins
be8edbd785
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-05 10:01:47 +11:00
Greg Wilkins
07aa997568
357240 test that triggers no progress handling
2011-10-05 10:01:34 +11:00
Jan Bartel
32dbb1bddb
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-deploy/src/main/config/etc/jetty-deploy.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-10-04 17:45:15 +11:00
Jesse McConnell
b67d307ff3
[Bug 359675] Principal != String, fix for issue in property file login
...
manager
2011-10-03 17:50:35 -05:00
Greg Wilkins
c438d7c043
improved websocket testserver example to include ping/pong
2011-10-03 18:03:57 +11:00
Greg Wilkins
fbb4893352
improved websocket testserver example to include ping/pong
2011-10-03 18:03:42 +11:00
Greg Wilkins
7bf5f7792b
359673 updated websocket version handling
2011-10-03 16:04:37 +11:00
Greg Wilkins
18aa8fed9b
359673 updated websocket version handling
2011-10-03 16:04:13 +11:00
Greg Wilkins
c668f8b82d
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-03 15:08:02 +11:00
hmalphettes
ab6ff817a3
JETTY-1378 new sys property for the latest jsp-impl to force the use of the JDTCompiler when running in OSGi.
2011-10-03 09:37:53 +08:00
Greg Wilkins
b30ac39868
Merge branch 'master' into sslClose
2011-10-03 10:50:11 +11:00
Simone Bordet
ae62618a00
Reworked logging, and catching IOException during the processing of a close.
2011-10-01 17:56:48 +02:00
Jesse McConnell
b179883dfe
blank commit testing serverside repack for webmaster
2011-09-30 15:41:03 -05:00
Jesse McConnell
8c1307e1c3
blank change
2011-09-30 09:56:13 -05:00
Jesse McConnell
211e196dc6
add license block
2011-09-30 08:09:42 -05:00
Jesse McConnell
727d293264
minor formatting tweaks and one scope change
2011-09-30 07:58:39 -05:00
Thomas Becker
3e73e79c1e
code convention fixes, javadoc update
2011-09-30 07:58:39 -05:00
Thomas Becker
37845a1a4f
357687: Add ShutdownHandler + UnitTest
2011-09-30 07:58:39 -05:00
Jesse McConnell
53b9f1cc7e
[Bug 336443] add missing comma in DigestAuthenticator string
2011-09-29 16:57:30 -05:00
Simone Bordet
a134664b4c
Method close() should really close the underlying channel, not only send the SSL close message.
2011-09-29 23:01:43 +02:00
Jesse McConnell
9b9bc9e79c
Add an additional test using forwarding via filter
2011-09-29 15:14:26 -05:00
Greg Wilkins
79e431f330
cleanup
2011-09-29 17:36:23 +10:00
Greg Wilkins
7cb3246624
Merge branch 'master' into sslClose
2011-09-29 15:50:42 +10:00
Greg Wilkins
d0a2557527
357240 fixed client connection recycle
2011-09-29 15:50:09 +10:00
Jesse McConnell
3dc0120d57
[Bug 359309] adjust previous test for servletPath to include pathInfo
2011-09-28 18:43:43 -05:00
Jesse McConnell
7ecea5afd0
[Bug 359309] resolve include and forward issues related to resource handler
2011-09-28 18:30:20 -05:00
Jesse McConnell
45e6cfa790
[Bug 359309] fix unit test to use HttpServlet*Wrappers and reformat the resourcehandler a bit to debug last two issues
2011-09-28 18:02:27 -05:00
Greg Wilkins
f14bbbfc0a
fixed bad merge
2011-09-29 08:17:23 +10:00
Greg Wilkins
21a111db27
Merge branch 'master' into sslClose
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
2011-09-29 08:10:39 +10:00