Jesse McConnell
7eca345e8d
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 09:43:31 -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
a8f24a2b64
360066 jsps referenced in web.xml <jsp-file> elements do not compile
2011-10-06 17:32:31 +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
Jan Bartel
11ae5c7dd3
JETTY-1434
...
Add a jsp that exercises jstl.
2011-09-26 20:59:37 +10:00
Joakim Erdfelt
298a623fe9
357959 - Include javadoc in distribution
...
+ Adjusting /javadoc/ proxy configuration in test-jetty-webapp to
now be /javadoc-proxy/, along with providing a link to the
distribution's /javadoc/ path as well.
2011-09-16 11:05:07 -07:00
Thomas Becker
670e8de261
352050: Fixed infinite redirect loop for /remote.html in testapp
2011-09-13 11:58:30 -07:00
Joakim Erdfelt
246fb51cfc
357163 - jetty 8 ought to proxy jetty8 javadocs
...
+ Fixing proxy configuration to use jetty8 javadocs destination.
2011-09-13 10:43:08 -07:00
Jesse McConnell
d5304b2cbc
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:20:15 -05:00
Jesse McConnell
c33548d38a
[maven-release-plugin] prepare release jetty-8.0.1.v20110908
2011-09-08 12:19:24 -05:00
Jesse McConnell
ebdb89dc23
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:00:16 -05:00
Jesse McConnell
932245a114
[maven-release-plugin] prepare release jetty-7.5.1.v20110908
2011-09-08 12:00:10 -05:00
Jesse McConnell
721c8ab682
updating version.txt and resetting pom version to 8.0.1-SNAPSHOT
2011-09-08 11:54:53 -05:00
Jesse McConnell
37d0f53b0a
updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT
2011-09-08 11:40:37 -05:00
Jesse McConnell
4e47d6a7fa
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:16:58 -05:00
Jesse McConnell
d77a12962b
[maven-release-plugin] prepare release jetty-8.0.1.v20110907
2011-09-07 18:16:50 -05:00
Jesse McConnell
6b614a54f0
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:12:16 -05:00
Jesse McConnell
ce55c8c601
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 18:12:09 -05:00
Jesse McConnell
7c7fc30b90
Merge over from jetty 7 master
2011-09-07 16:08:35 -05:00
Jesse McConnell
cbde93f1c9
add jetty websocket as a dependency that is no longer provided
2011-09-07 13:41:08 -05:00
Jesse McConnell
1744b5bce1
reset from release
2011-09-07 11:09:46 -05:00
Jesse McConnell
ae86ad6d4e
[maven-release-plugin] prepare for next development iteration
2011-09-07 10:03:16 -05:00
Jesse McConnell
86383afbd2
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 10:03:10 -05:00
Jesse McConnell
40dcb10ed8
[maven-release-plugin] prepare for next development iteration
2011-09-01 12:24:32 -05:00
Jesse McConnell
db14b194fa
[maven-release-plugin] prepare release jetty-8.0.0.v20110901
2011-09-01 12:24:24 -05:00
Jesse McConnell
a728021edf
[maven-release-plugin] prepare for next development iteration
2011-09-01 11:17:05 -05:00
Jesse McConnell
882308f781
[maven-release-plugin] prepare release jetty-7.5.0.c20110901
2011-09-01 11:16:58 -05:00
Jan Bartel
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
Jesse McConnell
57e9045635
[maven-release-plugin] prepare for next development iteration
2011-08-31 14:17:32 -05:00
Jesse McConnell
317491a4d7
[maven-release-plugin] prepare release jetty-7.5.0.v20110901
2011-08-31 14:17:25 -05:00
Joakim Erdfelt
e60df19490
[maven-release-plugin] prepare for next development iteration
2011-08-30 13:13:46 -07:00
Joakim Erdfelt
460c754e4e
[maven-release-plugin] prepare release jetty-7.5.0.RC2
2011-08-30 13:13:39 -07:00
Joakim Erdfelt
7663a83616
[maven-release-plugin] rollback the release of jetty-7.5.0.RC2
2011-08-30 12:52:45 -07:00
Joakim Erdfelt
4c5c954d23
[maven-release-plugin] prepare release jetty-7.5.0.RC2
2011-08-30 12:47:42 -07:00
Joakim Erdfelt
4ace183764
Merging from master
2011-08-25 12:09:36 -07:00
Greg Wilkins
def117775d
353073 recycle buffer
2011-08-25 12:28:49 +10:00
Joakim Erdfelt
f6d45d5650
293739 - Deprecate static Jetty Log usage in favor of named logs
...
+ Finished conversion of the rest of jetty 7.x
2011-08-24 13:14:28 -07:00
Greg Wilkins
e5a3cb9cef
[maven-release-plugin] prepare for next development iteration
2011-08-19 22:17:46 +10:00
Greg Wilkins
f0b4ffffda
[maven-release-plugin] prepare release jetty-7.5.0.RC1
2011-08-19 22:17:33 +10:00
Jesse McConnell
4700979200
[maven-release-plugin] prepare for next development iteration
2011-08-16 09:26:56 -05:00
Jesse McConnell
3ae78dfbb2
[maven-release-plugin] prepare release jetty-8.0.0.RC0
2011-08-16 09:26:48 -05:00
Greg Wilkins
ee1afa5e97
353073 cleaned up no context logging
2011-08-16 17:59:28 +10:00
Jesse McConnell
4d7ba354e1
[maven-release-plugin] prepare for next development iteration
2011-08-15 14:18:53 -05:00
Jesse McConnell
2175bae0a0
[maven-release-plugin] prepare release jetty-7.5.0.RC0
2011-08-15 14:18:42 -05:00
Jan Bartel
050cb83b35
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
jetty-websocket/pom.xml
2011-08-12 18:43:15 +10:00
Greg Wilkins
6b9ecd0806
353073 Improved client API to use futures
2011-08-11 11:50:23 +10:00
Jan Bartel
02a66a00fb
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
pom.xml
2011-08-01 14:39:39 +10:00
Greg Wilkins
2806869cfd
353073 test harness for websocket client and improved ietf draft 10 compliance
2011-08-01 12:35:01 +10:00
Jan Bartel
93cc111a02
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
Greg Wilkins
3302d54bab
352684 ensure test harness completes
2011-07-21 22:36:19 +10:00
