Jan Bartel
|
2ea7843d86
|
Merge remote-tracking branch 'origin/jetty-8'
|
2013-06-17 14:39:17 +10:00 |
|
Jan Bartel
|
1908fff38f
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-06-17 14:11:46 +10:00 |
|
Jan Bartel
|
59889bc149
|
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
|
2013-06-17 13:17:14 +10:00 |
|
Jan Bartel
|
232eb4491a
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
|
2013-06-17 13:13:59 +10:00 |
Thomas Becker
|
391b0ee426
|
ChatServletTest fix test
|
2013-06-13 17:36:29 +02:00 |
Jesse McConnell
|
a582b42d45
|
add logging properties for testing
|
2013-06-13 10:31:23 -05:00 |
|
Thomas Becker
|
df17ef8b3a
|
408709 refactor test-webapp's chat application. Now there's only a single request for user login and initial chat message.
|
2013-06-13 16:58:57 +02:00 |
|
Jesse McConnell
|
eddb49941d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-06-12 15:52:36 -05:00 |
Greg Wilkins
|
f8e0764fa5
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-06-11 14:07:46 +10:00 |
|
Greg Wilkins
|
06d3fbe5aa
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
|
2013-06-11 14:07:00 +10:00 |
|
Greg Wilkins
|
3de2ba33f1
|
fixed merge
|
2013-06-11 10:52:15 +10:00 |
|
Greg Wilkins
|
5d17bdcc27
|
fixed double dispatch in continuation tests
|
2013-06-11 10:50:15 +10:00 |
|
Greg Wilkins
|
d2794584e1
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
|
2013-06-07 15:48:22 +10:00 |
Joakim Erdfelt
|
a4d4d81580
|
Merge branch 'master' into javawebsocket-jsr
|
2013-06-04 13:23:15 -07:00 |
|
Joakim Erdfelt
|
3db9299369
|
Merge branch 'jetty-7' into jetty-8
|
2013-06-04 11:24:44 -07:00 |
|
Joakim Erdfelt
|
4b458792c9
|
JDK5 build fix with Resource caching and path lookups
|
2013-06-04 10:42:32 -07:00 |
|
Jan Bartel
|
6cbffcb332
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/DirectNIOBuffer.java
|
2013-06-04 10:39:05 +10:00 |
|
Jan Bartel
|
f65fc71288
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-06-04 10:37:16 +10:00 |
|
Jan Bartel
|
26c1e5bdbc
|
407342 ReloadedSessionMissingClassTest uses class compiled with jdk7
|
2013-06-04 10:34:52 +10:00 |
|
Jan Bartel
|
af02e9b16d
|
Update to version to 8.1.12-SNAPSHOT after last release
|
2013-05-30 10:52:39 +10:00 |
|
Joakim Erdfelt
|
598ecd7d7f
|
Merge branch 'master' into javawebsocket-jsr
|
2013-05-22 09:25:06 -07:00 |
|
Jesse McConnell
|
725dc261c8
|
Merge branch 'release-8' into jetty-8
|
2013-05-22 10:44:14 -05:00 |
|
Jesse McConnell
|
a1a6f0e5f2
|
Merge branch 'release-7' into jetty-7
|
2013-05-22 10:39:24 -05:00 |
|
Jesse McConnell
|
742f6a063d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-05-21 13:16:39 -05:00 |
|
Jesse McConnell
|
bdbd92dbc9
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-05-21 13:10:07 -05:00 |
|
Jesse McConnell
|
0858e69cb1
|
[maven-release-plugin] prepare for next development iteration
|
2013-05-20 07:19:34 -05:00 |
|
Jesse McConnell
|
d469b77663
|
[maven-release-plugin] prepare release jetty-8.1.11.v20130520
|
2013-05-20 07:19:25 -05:00 |
|
Jesse McConnell
|
497c2f7819
|
[maven-release-plugin] prepare for next development iteration
|
2013-05-20 07:15:00 -05:00 |
|
Jesse McConnell
|
b32d0260c9
|
[maven-release-plugin] prepare release jetty-7.6.11.v20130520
|
2013-05-20 07:14:52 -05:00 |
|
Jan Bartel
|
cf71e9559b
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-05-17 17:19:54 +10:00 |
|
Jan Bartel
|
b6d1158c22
|
408167 JDBCSessionManager don't mark session as dirty if same attribute value set
|
2013-05-17 17:18:54 +10:00 |
|
Joakim Erdfelt
|
9f82849900
|
Merge from [master] to [javawebsocket-jsr]
|
2013-05-09 12:10:57 -07:00 |
|
Jan Bartel
|
9b57f9e29a
|
Fix test-spec test for new annotation added.
|
2013-05-09 12:18:53 +10:00 |
|
Jan Bartel
|
2fb23e705c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/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/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/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-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/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-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/AnnotationTest.java
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2013-05-09 11:29:45 +10:00 |
|
Jesse McConnell
|
3d600ed95e
|
[maven-release-plugin] prepare for next development iteration
|
2013-05-06 18:13:04 -05:00 |
|
Jesse McConnell
|
d832f3dc7e
|
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
|
2013-05-06 18:12:55 -05:00 |
|
Jan Bartel
|
143b387727
|
Improve styles for test webapps
|
2013-05-06 19:13:41 +10:00 |
|
Jan Bartel
|
a5c143063f
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-05-06 17:00:47 +10:00 |
|
Jan Bartel
|
b182f09b2c
|
405944 Check annotation and resource injection is supported for AsyncListener
|
2013-05-06 16:32:38 +10:00 |
|
Greg Wilkins
|
b89de0346d
|
updated jndi, jaas and annotation tests to webapps.demo
|
2013-05-06 16:16:43 +10:00 |
|
Jan Bartel
|
8d0cf5e949
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-05-06 14:46:28 +10:00 |
|
Greg Wilkins
|
d3f33909c2
|
improved comments for ini files
|
2013-05-06 09:26:14 +10:00 |
|
Jan Bartel
|
f544d6e701
|
405422 Implement servlet3.1 spec sections 4.4.3 and 8.1.4 for new HttpSessionIdListener class
|
2013-05-03 18:27:51 +10:00 |
|
Jan Bartel
|
e7ecfd2b2b
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
|
2013-05-02 09:07:24 +10:00 |
|
Greg Wilkins
|
9558d7e815
|
modular start.ini files and --download start option
|
2013-04-26 13:53:28 +10:00 |
|
Jan Bartel
|
2360f5dcd5
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
|
2013-04-23 15:08:56 +10:00 |
|
Joakim Erdfelt
|
346034b44f
|
JSR-356 removing redundant try/catch
|
2013-04-22 11:16:01 -07:00 |
|
Greg Wilkins
|
03fd068ebc
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
|
2013-04-22 14:20:03 +10:00 |
|
Jan Bartel
|
87d4690462
|
405533 Implement special role ** for security constraints
|
2013-04-19 15:53:45 +10:00 |
|
Greg Wilkins
|
a7073d05a6
|
updated version to 9.1.0-SNAPSHOT
|
2013-04-19 13:59:18 +10:00 |
|
Jan Bartel
|
d34bd7aec7
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-04-18 12:16:24 +10:00 |
|
Jesse McConnell
|
7baaa14ba1
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-17 11:46:39 -05:00 |
|
Jesse McConnell
|
e390b54b25
|
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
|
2013-04-17 11:46:31 -05:00 |
|
Jesse McConnell
|
0b20467c6f
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-15 11:40:45 -05:00 |
|
Jesse McConnell
|
3aa4301711
|
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
|
2013-04-15 11:40:37 -05:00 |
|
Jan Bartel
|
db21b42b4f
|
Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).
|
2013-04-15 17:44:35 +10:00 |
|
Greg Wilkins
|
4e3c7367af
|
virtual host example
|
2013-04-15 12:29:08 +10:00 |
|
Jan Bartel
|
07b844bf85
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-04-11 15:55:04 +10:00 |
|
Greg Wilkins
|
b8dd8bde14
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-08 12:31:34 +10:00 |
|
Greg Wilkins
|
bf3771904b
|
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
|
2013-04-08 12:30:59 +10:00 |
|
Jan Bartel
|
7523c5234c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-jsp/pom.xml
|
2013-04-04 13:31:33 +11:00 |
|
Jan Bartel
|
af5f8aac33
|
403122 Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy
|
2013-03-28 15:02:33 +11:00 |
|
Jan Bartel
|
370df6e723
|
404036 JDBCSessionIdManager.doStart() method should not call cleanExpiredSessions() because Listeners can't be notified
|
2013-03-26 23:45:28 +11:00 |
|
Jan Bartel
|
279dff381c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
|
2013-03-18 16:00:23 +11:00 |
|
Jesse McConnell
|
acb5919844
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-12 09:10:50 -05:00 |
|
Jesse McConnell
|
d6ebdc0a4a
|
[maven-release-plugin] prepare release jetty-7.6.10.v20130312
|
2013-03-12 09:10:42 -05:00 |
|
Jesse McConnell
|
0405c8ded6
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-12 09:05:25 -05:00 |
|
Jesse McConnell
|
852178cd01
|
[maven-release-plugin] prepare release jetty-8.1.10.v20130312
|
2013-03-12 09:05:14 -05:00 |
|
Jan Bartel
|
0834ad259c
|
402706 HttpSession.setMaxInactiveInterval(int) does not change JDBCSession expiry
|
2013-03-11 19:31:39 +11:00 |
|
Joakim Erdfelt
|
bbf44a5d32
|
Merge branch 'release-9'
|
2013-03-09 06:16:25 -07:00 |
|
Joakim Erdfelt
|
897c35c2cb
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-08 11:33:23 -07:00 |
|
Joakim Erdfelt
|
cc6196af50
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
|
2013-03-08 11:33:15 -07:00 |
|
Jan Bartel
|
f1cd726ba2
|
Merge remote-tracking branch 'origin/jetty-8'
|
2013-03-08 14:27:24 +11:00 |
|
Jan Bartel
|
9055132144
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-03-08 13:45:56 +11:00 |
|
Jan Bartel
|
57cff606fd
|
400144 When loading a session fails the JDBCSessionManger produces duplicate session IDs
|
2013-03-08 13:33:48 +11:00 |
|
Joakim Erdfelt
|
7fc38f6c0f
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-07 19:14:19 -07:00 |
|
Joakim Erdfelt
|
96d045442f
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
|
2013-03-07 19:14:11 -07:00 |
|
Jesse McConnell
|
778ee1411b
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-06 10:21:46 -06:00 |
|
Jesse McConnell
|
d916078711
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
|
2013-03-06 10:21:38 -06:00 |
|
Joakim Erdfelt
|
94756a42c3
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-01 16:08:32 -07:00 |
|
Joakim Erdfelt
|
96dabe7e62
|
[maven-release-plugin] prepare release jetty-9.0.0.RC3
|
2013-03-01 16:08:24 -07:00 |
|
Joakim Erdfelt
|
c267c1a9d0
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-01 10:26:43 -07:00 |
|
Joakim Erdfelt
|
ba15fe04e2
|
[maven-release-plugin] prepare release jetty-9.0.0.RC3
|
2013-03-01 10:26:34 -07:00 |
|
Jan Bartel
|
90b5ea2c5e
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
|
2013-03-01 19:08:09 +11:00 |
|
Joakim Erdfelt
|
29b2118870
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-26 09:20:45 -07:00 |
|
Joakim Erdfelt
|
2b82b54f6d
|
[maven-release-plugin] prepare release jetty-9.0.0.RC2
|
2013-02-26 09:20:45 -07:00 |
|
Greg Wilkins
|
c60f18e7dd
|
401644 Dump does not login user already logged in
|
2013-02-25 13:34:58 +11:00 |
|
Jan Bartel
|
b2b888d18a
|
Use etc/jetty-plus.xml from start.ini by preference for test-jndi-webapp
|
2013-02-22 15:22:40 +11:00 |
|
Jan Bartel
|
1153e0455c
|
Use etc/jetty-plus.xml and etc/jetty-annotations.xml in start.ini for test-spec webapp
|
2013-02-22 13:00:07 +11:00 |
|
Jan Bartel
|
246088c2ee
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/JettyOSGiBootContextAsService.java
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWebAppAsService.java
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java
|
2013-02-14 20:08:37 +11:00 |
|
Joakim Erdfelt
|
a9f6f30242
|
Merge branch 'jetty-7' into jetty-8
|
2013-02-05 18:08:15 -07:00 |
|
Joakim Erdfelt
|
65c2112964
|
Making Jsp tests work on JDK's less than 7
|
2013-02-05 18:00:58 -07:00 |
|
Joakim Erdfelt
|
4dc3ed38c2
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-05 10:00:36 -07:00 |
|
Joakim Erdfelt
|
ed24f78498
|
[maven-release-plugin] prepare release jetty-9.0.0.RC0
|
2013-02-05 10:00:36 -07:00 |
|
Jesse McConnell
|
e073ceb06d
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-05 10:00:36 -07:00 |
|
Jesse McConnell
|
2f2ad287af
|
[maven-release-plugin] prepare release jetty-9.0.0.RC0
|
2013-02-05 10:00:35 -07:00 |
Simone Bordet
|
209d5bc12f
|
399721 - Change <Ref id= ...> to <Ref refid= ...>
|
2013-02-01 13:03:11 +01:00 |
|
Joakim Erdfelt
|
1480f3d8fc
|
399669 - Remove WebSocketConnection in favor of websocket.api.Session
|
2013-01-31 12:09:04 -07:00 |
|
Jesse McConnell
|
5c58878c3c
|
[maven-release-plugin] prepare for next development iteration
|
2013-01-31 11:34:38 -06:00 |
|
Jesse McConnell
|
ebbe37294f
|
[maven-release-plugin] prepare release jetty-8.1.9.v20130131
|
2013-01-31 11:34:30 -06:00 |
|
Jesse McConnell
|
a5e1e04af1
|
[maven-release-plugin] prepare for next development iteration
|
2013-01-31 08:42:20 -06:00 |
|
Jesse McConnell
|
b7fb18fd65
|
[maven-release-plugin] prepare release jetty-7.6.9.v20130131
|
2013-01-31 08:42:12 -06:00 |
|
Jan Bartel
|
9194fe1b7b
|
399566 Running org.eclipse.jetty.server.session.MaxInactiveMigrationTest produces stack trace
|
2013-01-31 15:42:27 +11:00 |
|
Greg Wilkins
|
b132663c2b
|
jetty-9 made WebAppContext configuration additive
|
2013-01-31 12:21:04 +11:00 |
|
Joakim Erdfelt
|
4f48bc7e7b
|
399343 - OnWebSocketConnect should use api.Session parameter instead.
+ Changed method signature for WebSocketListener and the various
@OnWebSocket* annotations
|
2013-01-29 13:22:38 -07:00 |
|
Jesse McConnell
|
e26c60e073
|
Merge jetty-8 to master
|
2013-01-29 14:06:47 -06:00 |
|
Jan Bartel
|
497acc8555
|
399132 check parent dir of session store against file to be removed
|
2013-01-27 10:18:27 +11:00 |
|
Jesse McConnell
|
2cbb630f8e
|
Merge branch 'jetty-8'
|
2013-01-25 16:53:46 -06:00 |
|
Jesse McConnell
|
f16fc7e7b7
|
Merge branch 'jetty-7' into jetty-8
|
2013-01-25 16:53:18 -06:00 |
|
Jesse McConnell
|
1a31067369
|
Add note about getCanonicalFile check and fix IdleSession test in test hash sessions
|
2013-01-25 16:25:59 -06:00 |
|
Greg Wilkins
|
7fd04a186f
|
cleanup after merge
|
2013-01-25 11:47:47 +11:00 |
|
Jan Bartel
|
a36c55d7a0
|
Update instructions for test-spec webapp
|
2013-01-25 11:28:40 +11:00 |
|
Jan Bartel
|
16ef1cbd74
|
Update deployment instructions for test-jndi webapp
|
2013-01-25 11:09:19 +11:00 |
|
Greg Wilkins
|
dc4e525622
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
|
2013-01-21 17:04:22 +11:00 |
|
Greg Wilkins
|
46e13b305b
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
|
2013-01-17 11:00:20 +11:00 |
|
Greg Wilkins
|
9cf08249e0
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-01-17 09:16:40 +11:00 |
|
Greg Wilkins
|
c4e77feefa
|
unit test uses fake JSP
|
2013-01-15 15:53:54 +11:00 |
|
Jesse McConnell
|
e1c516c7d1
|
merge from jetty-8 and update license blocks.
|
2013-01-11 17:04:53 -06:00 |
|
Jesse McConnell
|
863944873d
|
merge from 7 and update license blocks for 2013
|
2013-01-11 15:01:16 -06:00 |
|
Jesse McConnell
|
a4dbb5823c
|
update license blocks for 2013
|
2013-01-11 14:57:51 -06:00 |
|
Greg Wilkins
|
27c31fb403
|
jetty-9 organised imports. Cleaned up some TODOs
|
2013-01-11 16:37:32 +11:00 |
|
Greg Wilkins
|
3efcc2af41
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
|
2013-01-10 16:24:41 +11:00 |
|
Greg Wilkins
|
e4d51d5c16
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-01-10 13:25:51 +11:00 |
|
Greg Wilkins
|
1add18a57b
|
397535 Support pluggable alias checking to support symbolic links
|
2013-01-10 13:23:11 +11:00 |
|
Greg Wilkins
|
08afd17b88
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
|
2013-01-10 13:04:30 +11:00 |
|
Greg Wilkins
|
8deb1222db
|
Making change to reintroduce this test to merged 8
|
2013-01-10 13:03:27 +11:00 |
|
Greg Wilkins
|
8232a87411
|
temporarly remove test
|
2013-01-10 12:52:21 +11:00 |
|
Greg Wilkins
|
74edf1867c
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
|
2013-01-10 12:06:55 +11:00 |
|
Joakim Erdfelt
|
7a3b440a62
|
Refactoring Jsp + DefaultServlet + Resource Aliasing test cases
|
2013-01-09 15:22:32 -07:00 |
|
Joakim Erdfelt
|
83aa65415b
|
Fixing for JDK 6
|
2013-01-07 09:37:13 -07:00 |
|
Greg Wilkins
|
2aab780eba
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
|
2013-01-07 23:45:38 +11:00 |
|
Greg Wilkins
|
ccda9bb10b
|
397535 Support pluggable alias checking to support symbolic links
|
2013-01-07 19:57:52 +11:00 |
|
Jan Bartel
|
a4c547d61f
|
Make JspMatchingTest work with jsp 2.1 using maven command line build
|
2013-01-07 19:18:53 +11:00 |
|
Jan Bartel
|
39cae560d8
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
tests/test-integration/pom.xml
|
2013-01-07 16:12:04 +11:00 |
|
Jan Bartel
|
8d0e776b2a
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
test-jetty-webapp/pom.xml
tests/test-integration/pom.xml
|
2013-01-07 12:47:32 +11:00 |
|
Jan Bartel
|
64df770b42
|
Make new JspMatchingTest work with jsp2.2 for jetty-8
|
2013-01-07 12:34:57 +11:00 |
|
Jan Bartel
|
d2c2e8693f
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-01-07 10:38:48 +11:00 |
|
Joakim Erdfelt
|
c23f722286
|
Reverting validation changes to FileResource and disabling tests
|
2013-01-02 10:32:16 -07:00 |
|
Joakim Erdfelt
|
9fde0c56ab
|
Merge branch 'jetty-7' into jetty-8
|
2012-12-27 14:22:57 -07:00 |
|
Joakim Erdfelt
|
1da584003a
|
Moving new tests from test-jetty-webapp as a webapp to test-integration as embedded
|
2012-12-27 13:53:38 -07:00 |
|
Jesse McConnell
|
3c7b78b8f4
|
adjust to fit
|
2012-12-26 15:20:19 -03:00 |
|
Jesse McConnell
|
82d6388a59
|
Address javadoc linkages in test webapp and root context
|
2012-12-26 15:05:17 -03:00 |
|
Jesse McConnell
|
2bc4cdcd01
|
wire up transparent access for both xref and apidocs
|
2012-12-26 15:01:41 -03:00 |
|
Greg Wilkins
|
31def06214
|
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
|
2012-12-24 19:17:00 +11:00 |
|
Jan Bartel
|
346918577f
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
test-jetty-webapp/src/main/java/com/acme/CookieDump.java
test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
|
2012-12-22 15:12:17 +11:00 |
|
Simone Bordet
|
b6e4f98cf7
|
Performance improvements to HTTP client after profiling session.
The profiling suggested to reduce the number of unneeded allocations
and this required a couple of API changes.
|
2012-12-19 16:27:20 +01:00 |
|
Simone Bordet
|
c9f4513a89
|
Reworked HTTP client API, removing usage of Future.
|
2012-12-19 16:27:20 +01:00 |
|
Joakim Erdfelt
|
e308f843db
|
Replacing FrameBytes tree with WriteBytesProvider class
|
2012-12-14 16:12:48 -07:00 |
|
Jan Bartel
|
f6e5e547f0
|
396475 Remove unneeded websocket-server dependency from test-jetty-webapp
|
2012-12-13 19:58:50 +11:00 |
|
Greg Wilkins
|
6f098dd69c
|
jetty-9 use DateCache timer to set Date header once per second
|
2012-12-10 12:58:14 +11:00 |
|
Jan Bartel
|
c9db4ca815
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-proxy/pom.xml
pom.xml
|
2012-11-30 15:45:36 +11:00 |
|
Greg Wilkins
|
4d823c28bf
|
jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref
|
2012-11-29 17:41:54 +11:00 |
|
Greg Wilkins
|
21f717078c
|
jetty-9 handle null push strategy
|
2012-11-29 17:03:40 +11:00 |
|
Greg Wilkins
|
9931ddec94
|
jetty-9 fixed test webapp TestServer and improved error message
|
2012-11-29 17:03:40 +11:00 |
|
Greg Wilkins
|
5ee2ea85bb
|
fixed path for new layout
|
2012-11-29 15:55:33 +11:00 |
|
Thomas Becker
|
0fd789216d
|
test-jetty-weappap - Remove wiki link and replace with documentation
|
2012-11-27 14:26:36 +01:00 |
|
Greg Wilkins
|
7115ea5e12
|
jetty-9 added missing manifest (was ignored)
|
2012-11-26 20:48:56 +11:00 |
|
Greg Wilkins
|
3b935c9061
|
jetty-9 fixed assembly
|
2012-11-26 17:33:50 +11:00 |
|
Greg Wilkins
|
9a4e5f3301
|
jetty-9 Added proxy test webapp. Refined no servlet context handling
|
2012-11-26 16:57:37 +11:00 |
|
Thomas Becker
|
ab642141d1
|
Add jetty-maven-plugin to test-webapp-rfc2616
|
2012-11-23 11:01:58 +01:00 |
|
Greg Wilkins
|
f89909e301
|
jetty-9 cleaning up dependencies
|
2012-11-23 16:25:57 +11:00 |
|
Jan Bartel
|
3393108950
|
Fix link to jetty @ eclipse for test webapp
|
2012-11-23 10:52:49 +11:00 |
|
Jan Bartel
|
332017d84d
|
Fix link to jetty @ eclipse
|
2012-11-23 10:48:28 +11:00 |
|
Jan Bartel
|
fc2682ab02
|
394870 Make enablement of remote access to test webapp configurable in override-web.xml
|
2012-11-23 10:35:10 +11:00 |
|
Jan Bartel
|
5f69945b33
|
Update remote.html text for jetty-9
|
2012-11-22 21:52:56 +11:00 |
|
Thomas Becker
|
3ea03e7094
|
394860: fix test-jetty-webapp to work with mvn jetty:run again
|
2012-11-22 10:22:19 +01:00 |
|
Jan Bartel
|
11704ab986
|
Port IdleSessionTest to jetty-9 api
|
2012-11-22 18:38:23 +11:00 |
|
Greg Wilkins
|
f0cc03ede5
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
|
2012-11-22 17:01:55 +11:00 |
|
Greg Wilkins
|
e42b5bf970
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2012-11-22 16:35:26 +11:00 |
|
Jan Bartel
|
90a86d3a6b
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2012-11-22 16:26:38 +11:00 |
|
Jan Bartel
|
f6a8005b91
|
Add blank for license header check
|
2012-11-22 16:13:44 +11:00 |
|
Jan Bartel
|
8920fcc128
|
394829 Session can not be restored after SessionManager.setIdleSavePeriod has saved the session
|
2012-11-22 15:50:01 +11:00 |
|
Greg Wilkins
|
99fbca11f2
|
jetty-9 turn on client OPTION for test-webapp
|
2012-11-20 10:04:57 +11:00 |
|
Greg Wilkins
|
2ad9dd5b95
|
jetty-9 corrected groupId after move
|
2012-11-20 09:53:56 +11:00 |
|
Jesse McConnell
|
a0c1d85094
|
Revert "jetty-9 cleaned up serverClasses to minimum"
This reverts commit 67b5caadbb.
|
2012-11-19 10:33:54 -06:00 |
|
Jesse McConnell
|
ebd807b904
|
Revert "jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini"
This reverts commit 4bd36e3d38.
|
2012-11-19 10:33:45 -06:00 |
|
Jan Bartel
|
3642de3b8a
|
392237 - Port test-integration to jetty-9
|
2012-11-19 18:48:03 +11:00 |
|
Greg Wilkins
|
4bd36e3d38
|
jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini
|
2012-11-19 18:35:32 +11:00 |
|
Greg Wilkins
|
67b5caadbb
|
jetty-9 cleaned up serverClasses to minimum
|
2012-11-19 17:42:52 +11:00 |
|
Jan Bartel
|
be816d853b
|
392237 Port tests/login-service to jetty-9
|
2012-11-19 16:31:53 +11:00 |
|
Greg Wilkins
|
82117bc833
|
jetty-9 fixed hostHeader handling in ProxyServlet and re-enabled in test webapp
|
2012-11-19 16:22:27 +11:00 |
|
Greg Wilkins
|
f21b74dcb1
|
jetty-9 relocated test webapp
|
2012-11-19 15:57:38 +11:00 |
|
Jan Bartel
|
0912731b89
|
Add test-mock-resources to plugin dependencies for test-jndi-webapp
|
2012-11-19 13:29:29 +11:00 |
|
Jan Bartel
|
b000fa4f34
|
394545 Add jetty-jaas dependency to jetty-maven-plugin
|
2012-11-19 12:21:01 +11:00 |
|
Jan Bartel
|
13e0b40c8b
|
Update context path from /test-annotations to /test-spec for test-spec-webapp
|
2012-11-08 13:54:04 +11: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 |
|
Jan Bartel
|
ce1c1107eb
|
Fix license headers
|
2012-11-02 23:09:09 +11:00 |
|
Jan Bartel
|
2a2215cf0b
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2012-11-02 16:59:11 +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
|
94c05e6c2e
|
Porting test webapps from codehaus to jetty-9
|
2012-11-02 15:43:05 +11:00 |
|
Greg Wilkins
|
3683653052
|
393303 use jetty-web.xml to explicitly add the jetty packages that need visability. This commit also sucked in some changes made to help with the documentation process (improving deployer configuration management
|
2012-11-01 20:20:45 +11:00 |
|
Joakim Erdfelt
|
a1bf37f2a5
|
Trying to fix intellij scope concern
|
2012-10-30 08:35:01 -07:00 |
|
Jan Bartel
|
c49563244c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2012-10-30 19:18:20 +11:00 |
|
Jan Bartel
|
a74c9f176c
|
392237 Split jaas from jetty-plus into jetty-jaas and port the test-jaas-webapp from codehaus
|
2012-10-29 18:21:37 +11:00 |
|
Jan Bartel
|
3d198a94fb
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2012-10-29 16:06:38 +11:00 |
|
Jan Bartel
|
8b90057b68
|
371170 MongoSessionManager LastAccessTimeTest fails
|
2012-10-29 16:05:46 +11:00 |
|
Jan Bartel
|
d1dfc56e04
|
Merge remote-tracking branch 'origin/jetty-8'
|
2012-10-29 15:07:26 +11:00 |