Jesse McConnell
5aa79ebb15
[maven-release-plugin] prepare for next development iteration
2011-12-06 15:36:40 -06:00
Jesse McConnell
d178aad479
[maven-release-plugin] prepare release jetty-8.1.0.RC1
2011-12-06 15:36:34 -06:00
Jesse McConnell
f188ea4c0f
Updating VERSION.txt top section
2011-12-06 15:15:56 -06:00
Jesse McConnell
7e4af3617c
Merge branch 'jetty-8' into release-8
2011-12-06 15:15:15 -06:00
Jesse McConnell
7e6231f3ae
make sure that jsp version isn't kicked up to servelt 2.6 version
2011-12-06 15:13:12 -06:00
Jesse McConnell
26b5d5e589
update versions of orbit dependencies and fix a naming issue in test-jetty-osgi
2011-12-06 14:20:10 -06:00
Simone Bordet
0689e05e9b
365750 - Support WebSocket over SSL, aka wss://
...
This is now implemented, using the new architecture of wrapping the connection with
SslConnection.
The only refactoring was to avoid that the HTTP handshake was sent from the
HandshakeConnection constructor, because at that point the SSL wiring is not ready yet.
Now the handshake is sent from handle(), guarded by a boolean variable to sent it once.
2011-12-06 16:25:15 +01:00
hmalphettes
96eb1a6f92
workaround to fix the test error. did not find why those packages that are imported in osgi-boot-jsp still can't be resolved by felix.
2011-12-06 20:49:31 +08:00
hmalphettes
f31f4150d8
workaround to fix the test error. did not find why those packages that are imported in osgi-boot-jsp still can't be resolved by felix.
2011-12-06 20:45:57 +08:00
hmalphettes
a08f58634e
latest orbit libraries
2011-12-06 20:45:01 +08:00
Jan Bartel
0363b8100f
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-05 15:24:22 +11:00
Jan Bartel
e7cdc0fbee
Merge commit 'de005c6' into jetty-8
2011-12-05 15:22:41 +11:00
Jan Bartel
ba95a9ba3a
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-05 08:43:21 +11:00
Jesse McConnell
4c6112d7a9
Merge branch 'release'
2011-12-04 15:33:35 -06:00
Jesse McConnell
8ef68e1e0e
Updating VERSION.txt top section
2011-12-04 15:33:07 -06:00
Jan Bartel
15ab626410
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-05 08:31:49 +11:00
Jesse McConnell
41c746abee
[maven-release-plugin] prepare for next development iteration
2011-12-04 14:18:52 -06:00
Jesse McConnell
0c90133252
[maven-release-plugin] prepare release jetty-7.6.0.RC1
2011-12-04 14:18:45 -06:00
Jesse McConnell
56cd2df556
Updating VERSION.txt top section
2011-12-04 12:11:35 -06:00
Jesse McConnell
0b83f2c82d
Merge branch 'master' into release
2011-12-04 12:10:59 -06:00
Jesse McConnell
a2ce11fe6d
set proxy
2011-12-02 16:48:51 -06:00
Jesse McConnell
1174e47c65
set mirror
2011-12-02 16:41:13 -06:00
Jesse McConnell
f17742e3f2
adding settings.xml to test hudson build
2011-12-02 16:37:40 -06:00
hmalphettes
89afbdf31d
360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6
2011-12-02 17:27:26 +08:00
Jan Bartel
c6480fc659
365375 ResourceHandler should be a HandlerWrapper
2011-12-02 15:32:33 +11:00
Greg Wilkins
050afb8d57
365370 ServletHandler can fall through to nested handler
2011-12-02 11:09:11 +11:00
Jan Bartel
468e6c284d
365267 NullPointerException in bad Address
2011-12-02 10:04:03 +11:00
Greg Wilkins
7e9fbc7493
handle no jetty-dir css
2011-12-02 09:43:15 +11: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
9e72457941
Merge branch 'release-8'
2011-11-30 15:51:12 +11:00
Greg Wilkins
24ccaec3da
Updating VERSION.txt top section
2011-11-30 15:50:25 +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
Greg Wilkins
46c10b2b8a
Updating VERSION.txt top section
2011-11-30 12:46:36 +11:00
Greg Wilkins
dc92728c00
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
2011-11-30 12:21:02 +11:00
Greg Wilkins
df12605f0e
Merge branch 'release'
2011-11-30 07:30:02 +11:00
Greg Wilkins
0b066d3d8e
Updating VERSION.txt top section
2011-11-30 07:29:32 +11:00
Greg Wilkins
11e06e55b1
[maven-release-plugin] prepare for next development iteration
2011-11-29 23:56:11 +11:00
Greg Wilkins
fcf5f3beb2
[maven-release-plugin] prepare release jetty-7.6.0.RC0
2011-11-29 23:55:58 +11:00
Greg Wilkins
a47e07445a
Upating VERSION.txt top section
2011-11-29 13:08:26 +11:00
Greg Wilkins
05784d5081
Merge branch 'master' into release
2011-11-29 13:06:38 +11:00
Greg Wilkins
f3b2289527
release version
2011-11-29 13:06:05 +11:00
Greg Wilkins
a420df6bf1
Merge branch 'master' into release
2011-11-29 13:03:23 +11:00
Greg Wilkins
c4b19d8262
safer test
2011-11-29 10:15:36 +11:00
Greg Wilkins
dcf7ef2335
fixes after merge
2011-11-29 10:15:20 +11:00
Greg Wilkins
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
Greg Wilkins
4ce72ee549
improved test timing
2011-11-29 08:36:56 +11:00
Greg Wilkins
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
Greg Wilkins
3b2d3e5754
websocket not supported on blocking connectors
2011-11-28 15:31:07 +11:00
Greg Wilkins
9fb6e9b43a
363943 ignore null attribute values
2011-11-28 14:08:09 +11:00
