Jesse McConnell
|
a08536c8bc
|
set for dev
|
2012-11-06 08:18:06 -06:00 |
|
Jesse McConnell
|
32d0f950a9
|
set for dev
|
2012-11-06 08:15:05 -06:00 |
Jan Bartel
|
6b04056371
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
VERSION.txt
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
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/jetty-websocket/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-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/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-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2012-11-06 16:12:00 +11:00 |
|
Jan Bartel
|
d4c4a7aee0
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2012-11-06 15:31:47 +11:00 |
|
Jan Bartel
|
fe09ca0e66
|
391623 Add option to --stop to wait for target jetty to stop
|
2012-11-06 14:35:37 +11:00 |
|
Jesse McConnell
|
e1aa48267b
|
Merge branch 'release-8' into jetty-8
|
2012-11-05 14:40:14 -06:00 |
|
Jesse McConnell
|
9bf7d89190
|
set for dev
|
2012-11-05 14:39:50 -06:00 |
|
Jesse McConnell
|
0411045449
|
[maven-release-plugin] prepare for next development iteration
|
2012-11-05 13:54:10 -06:00 |
|
Jesse McConnell
|
87b67d477b
|
[maven-release-plugin] prepare release jetty-9.0.0.M2
|
2012-11-05 13:53:54 -06:00 |
|
Jesse McConnell
|
26b4f69a02
|
Merge branch 'release-7' into jetty-7
|
2012-11-05 13:25:12 -06:00 |
|
Jesse McConnell
|
c74a56582a
|
set for dev
|
2012-11-05 13:24:43 -06:00 |
|
Jesse McConnell
|
bb27f561c1
|
[maven-release-plugin] prepare for next development iteration
|
2012-11-05 12:24:06 -06:00 |
|
Jesse McConnell
|
1d767e99a3
|
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
|
2012-11-05 12:23:59 -06:00 |
|
Jesse McConnell
|
70d591c430
|
[maven-release-plugin] prepare for next development iteration
|
2012-11-05 12:16:03 -06:00 |
|
Jesse McConnell
|
017826b4eb
|
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
|
2012-11-05 12:15:57 -06:00 |
|
Jesse McConnell
|
063efdc484
|
Updating VERSION.txt top section
|
2012-11-05 11:57:40 -06:00 |
|
Jesse McConnell
|
0d78b07595
|
Merge branch 'master' into release-9
|
2012-11-05 11:56:52 -06:00 |
|
Jesse McConnell
|
d3565e8610
|
Updating VERSION.txt top section
|
2012-11-05 11:55:10 -06:00 |
|
Jesse McConnell
|
e97838e9d4
|
Merge branch 'jetty-8' into release-8
|
2012-11-05 11:52:44 -06:00 |
|
Jesse McConnell
|
eac9414f01
|
Merge branch 'jetty-7' into jetty-8
|
2012-11-05 11:52:18 -06:00 |
|
Jesse McConnell
|
a83f7794e1
|
Merge branch 'jetty-7' into release-7
|
2012-11-05 11:46:51 -06:00 |
|
Jesse McConnell
|
92e2ad44fc
|
Updating VERSION.txt top section
|
2012-11-05 11:45:59 -06:00 |
|
Jesse McConnell
|
073ab7af20
|
Merge branch 'jetty-7' into release-7
|
2012-11-05 11:43:27 -06:00 |
Joakim Erdfelt
|
53f1892f7b
|
Fixing license header
|
2012-11-05 10:40:20 -07:00 |
|
Joakim Erdfelt
|
7b3a15a403
|
Fixing license-check plugin scope
|
2012-11-05 10:39:52 -07:00 |
|
Joakim Erdfelt
|
c1f06f9329
|
Moving license check to default build for top-level only
|
2012-11-05 10:37:00 -07:00 |
|
Jesse McConnell
|
55de6fc6e4
|
add import for Locale
|
2012-11-05 11:31:11 -06:00 |
|
Jan Bartel
|
2acdf9f839
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java
jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD00Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD06Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD08Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
|
2012-11-05 17:27:49 +11:00 |
|
Jan Bartel
|
f3af8c8650
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2012-11-05 16:28:25 +11:00 |
|
Jan Bartel
|
fff825a997
|
393494 HashSessionManager can't delete unrestorable sessions on Windows
|
2012-11-05 16:26:20 +11:00 |
|
Jan Bartel
|
69cf9285c6
|
JETTY-1549 jetty-maven-plugin fails to reload the LoginService properly
|
2012-11-05 14:58:53 +11:00 |
|
Jan Bartel
|
0c84eefdcc
|
Rename AggregateLifeCycle to ContainerLifeCycle in javadoc
|
2012-11-05 12:16:39 +11:00 |
Greg Wilkins
|
36ddd3f5d6
|
393368 min websocket version
|
2012-11-05 11:02:50 +11:00 |
Thomas Becker
|
accc3b321a
|
config fix
|
2012-11-02 17:16:13 +01:00 |
|
Thomas Becker
|
971bf4dec7
|
393281: Add getters to expose ReferrerPushStrategy Config
|
2012-11-02 14:27:11 +01:00 |
|
Thomas Becker
|
3d3e077509
|
393281: Add User-Agent filter to ReferrerPushStrategy
|
2012-11-02 13:21:42 +01:00 |
|
Jan Bartel
|
ce1c1107eb
|
Fix license headers
|
2012-11-02 23:09:09 +11:00 |
|
Jan Bartel
|
4e7932f519
|
Add production warning; rename test-annotation.war to test-spec.war for jetty-9
|
2012-11-02 16:56:17 +11:00 |
|
Jan Bartel
|
2f735cf5a9
|
Adding jetty-jaas module to build for jetty-9
|
2012-11-02 15:43:59 +11:00 |
|
Jan Bartel
|
94c05e6c2e
|
Porting test webapps from codehaus to jetty-9
|
2012-11-02 15:43:05 +11:00 |
|
Joakim Erdfelt
|
949996931a
|
Fixing license (for check plugin)
|
2012-11-01 21:25:25 -07:00 |
|
Greg Wilkins
|
bca34dd87b
|
jetty-9 cleanups for doco fetches
|
2012-11-02 14:27:33 +11:00 |
|
Greg Wilkins
|
52464a5ba6
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
|
2012-11-02 14:08:05 +11:00 |
|
Greg Wilkins
|
5ad2161259
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2012-11-02 13:19:27 +11:00 |
|
Greg Wilkins
|
e076e8a8f0
|
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
|
2012-11-02 13:19:07 +11:00 |
|
Greg Wilkins
|
8723408731
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
|
2012-11-02 13:17:53 +11:00 |
|
Greg Wilkins
|
13f6940fc3
|
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
|
2012-11-02 13:16:53 +11:00 |
|
Joakim Erdfelt
|
b6cca66914
|
Fixing compile issue. File.getName(Locale) is not allowed.
|
2012-11-01 19:12:36 -07:00 |
|
Greg Wilkins
|
65202e9abe
|
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
|
2012-11-02 11:55:00 +11:00 |
|
Greg Wilkins
|
ba06103442
|
393383 delay onClose call until closeOut is done
|
2012-11-02 10:28:23 +11:00 |