52b4f6a51f
Merge branch 'jetty-9.2.x'
2014-11-07 10:31:01 -07:00
80ff2da394
Restoring License Headers to former glory
2014-11-07 10:30:55 -07:00
81ef9cdcca
Merge branch 'jetty-9.2.x'
...
Conflicts:
examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyConnector.java
2014-11-07 10:24:54 -07:00
a1d8a7a121
Making embedded examples more consistent.
...
+ appearance (similar syntax on all examples)
+ declarations (if a variable is used, use it consistently across all of
the examples)
+ line wrap at 80 columns (so that examples make sense when copy/pasted
around for discussion. like github)
+ updating javadoc comments to be consistent
2014-11-07 10:09:41 -07:00
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
b314bfcc94
446944 - ServletTester and HttpTester should be in <classifier>tests</classifier>
...
Moving HttpTester to "tests" scoped jetty-http artifact.
+ HttpTester, a testing class, was used by jetty-servlets,
embedded-jetty-examples, and test-integration, all from
those testing scopes. Moved the HttpTester into the
pre-existing jetty-http "tests" classified artifact.
Moving ServletTester to "tests" scoped jetty-servlet artifact.
+ ServletTester, a testing class, was used by jetty-servlets,
test-integration, and test-jetty-webapp. This move puts
this class in the pre-existing jetty-servlet "tests" classified
artifact.
2014-10-29 09:50:32 -07:00
8a72a153a1
Merge branch 'jetty-9.2.x'
2014-10-28 12:32:55 -07:00
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
264e0bce39
Revert "Moving HttpTester to "tests" scoped jetty-http artifact."
...
This reverts commit 8d85940077
2014-10-28 07:50:56 -07:00
1f5c03f5e9
Minor typo in SpdyServer
2014-10-28 07:49:47 -07:00
7cdcd69f44
Reverted version to 9.2.4-SNAPSHOT.
2014-10-28 11:52:00 +01:00
3b745f06df
[maven-release-plugin] prepare for next development iteration
2014-10-27 16:16:24 -05:00
4f0d78c91b
[maven-release-plugin] prepare release jetty-9.2.4.v20141027
2014-10-27 16:16:18 -05:00
ac1b111d57
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2014-10-24 08:46:12 +11:00
738c47bc55
447515 Remove GzipFilter
...
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
2014-10-24 08:17:05 +11:00
01a1fc166e
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-23 11:20:44 +11:00
627ba945f1
Added AsyncDelayHandler example
2014-10-23 09:11:27 +11:00
e7d830c26e
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-13 16:57:52 +02:00
8d85940077
Moving HttpTester to "tests" scoped jetty-http artifact.
...
+ HttpTester, a testing class, was used by jetty-servlets,
embedded-jetty-examples, and test-integration, all from
those testing scopes. Moved the HttpTester into the
pre-existing jetty-http "tests" classified artifact.
2014-10-13 07:35:12 -07:00
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
dacc796831
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
tests/test-quickstart/pom.xml
2014-08-29 17:52:58 +10:00
17c9a32268
moved quickstart to test-quickstart
2014-08-29 17:35:26 +10:00
edcb56ae6b
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-08-29 12:41:52 +10:00
8f62be9fef
442628 Update example xml file for second server instance to extract wars
2014-08-27 17:22:37 +10:00
4c8e2a6635
442642 Quickstart generates valid XML
...
Fixed issues with XmlParser and WebDescriptor that were stopping validation.
2014-08-27 16:38:49 +10:00
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
98b654ba20
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-distribution/pom.xml
2014-08-14 08:38:25 +10:00
18b6a9b3d9
435533 Handle 0 sized async gzip
2014-08-14 07:48:27 +10:00
6dfa452e29
case insensitive protocols
2014-08-07 19:00:31 +10:00
161bccda22
Merged branch 'master' into 'jetty-http2'.
2014-08-01 14:02:53 +02:00
229cdf2532
Remove duplicate jetty-plus dependency from embedded examples
2014-08-01 16:37:43 +10:00
9167a09279
Update embedded example for annotations and jndi to point to demo-base wars
2014-08-01 16:22:03 +10:00
424de52d96
411163 Add embedded jetty code example with JSP enabled
2014-08-01 16:16:26 +10:00
66980f2449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/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
examples/quickstart/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/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-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/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-alpn/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-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/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-alpn-tests/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-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/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/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/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-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-dispatch-webapp/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-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-07-25 17:37:53 +10:00
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
223ad1e519
Fixing groupId
2014-07-23 10:51:46 -07:00
faf0775b50
Fixing quickstart dependency loop
2014-07-23 10:50:00 -07:00
17a9fb2a3d
Fixing build
...
+ Quick start example is now in /examples/quickstart/ to avoid
dependency loop
+ Forgotten tests are now versioned correctly at 9.3.0
2014-07-23 10:47:19 -07:00
4f88f2fce2
Fixing build
...
+ Quick start example is now in /examples/quickstart/ to avoid
dependency loop
+ Forgotten tests are now versioned correctly at 9.3.0
2014-07-21 15:51:44 -07:00
a537fefd6b
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-18 15:28:54 +10:00
2d52280179
436987 limited range of default acceptors and selectors
2014-07-17 14:29:58 +10:00
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
Joakim Erdfelt
Jesse McConnell
Simone Bordet
Greg Wilkins
Jan Bartel