Jesse McConnell
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
Jesse McConnell
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
Greg Wilkins
758ce66c8d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-websocket/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
Jan Bartel
3eb42e7183
445830 Support setting environment variables on forked jetty with jetty:run-forked
2014-10-03 14:27:35 +10:00
Jan Bartel
607797b005
444676 Goal jetty:deploy-war produces errors with version 9.2.3
2014-09-24 14:33:32 +10:00
Joakim Erdfelt
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
Jesse McConnell
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
Jesse McConnell
c034544ab9
reset for release
2014-09-05 08:10:15 -05:00
Jesse McConnell
c23e5f4889
[maven-release-plugin] prepare for next development iteration
2014-08-21 09:13:38 -05:00
Jesse McConnell
3347e11281
[maven-release-plugin] prepare release jetty-9.2.3.v20140821
2014-08-21 09:13:32 -05:00
Greg Wilkins
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
Simone Bordet
161bccda22
Merged branch 'master' into 'jetty-http2'.
2014-08-01 14:02:53 +02:00
Jan Bartel
75c92bf76a
438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal
2014-08-01 12:44:30 +10:00
Joakim Erdfelt
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
Joakim Erdfelt
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
Greg Wilkins
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
Greg Wilkins
64e5c1e0ce
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-17 11:32:27 +10:00
Jan Bartel
1dcb7dd986
439194 Do not configure fake server for jetty:run-forked
2014-07-17 08:28:38 +10:00
Greg Wilkins
853e020210
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-16 15:31:48 +10:00
Jan Bartel
28998e4913
439399 Scan tlds for apache jasper standard taglib with jetty-maven-plugin
2014-07-11 17:38:31 +10:00
Jan Bartel
c674c41003
438895 Add mvn jetty:effective-web-xml goal
2014-07-10 17:29:03 +10:00
Jan Bartel
b13859c641
Fix javadoc for jetty:run mojo to point to correct documentation.
2014-07-10 17:29:03 +10:00
Greg Wilkins
5e281dd449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
Greg Wilkins
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
Jan Bartel
10da0e1015
439194 Refactor mvn jetty:run-forked so that it is configurable the same as the other jetty:run-X goals
2014-07-09 15:07:39 +10:00
Simone Bordet
59deebeb9c
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-19 16:26:58 +02:00
Simone Bordet
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
Jan Bartel
723640edbd
437430 jettyXml not consistent between jetty:run and jetty:run-forked
2014-06-16 18:31:14 +02:00
Jesse McConnell
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
Jesse McConnell
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
Greg Wilkins
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
Jesse McConnell
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
Jesse McConnell
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
Jesse McConnell
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
Jesse McConnell
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
Jan Bartel
1386f20cf5
435217 Remove deprecated TagLibConfiguration
2014-05-19 18:20:52 +02:00
Greg Wilkins
0bbec3826c
430341 use apache jsp/jstl for maven plugins
2014-04-03 14:27:27 +11:00
Greg Wilkins
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
Jesse McConnell
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
Jesse McConnell
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
Jan Bartel
8384b0febe
428418 JettyStopMojo prints some messages on System.err
2014-02-19 12:06:10 +11:00
Jesse McConnell
eb0aea46ce
set versions.txt file to new version and fix mistaken developmentVersion
2014-02-10 13:48:29 -06:00
Jesse McConnell
f3d38dfb15
[maven-release-plugin] prepare for next development iteration
2014-02-10 11:17:14 -06:00
Jesse McConnell
8f6cbc9111
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
2014-02-10 11:17:07 -06:00
Jan Bartel
c5c553260f
424171 Old javax.activation jar interferes with email sending
2014-02-06 10:31:35 +11:00
Jesse McConnell
b82ec6e668
[maven-release-plugin] prepare for next development iteration
2014-01-08 16:47:09 -06:00
Jesse McConnell
b99623a21d
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
2014-01-08 16:47:01 -06:00
Joakim Erdfelt
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
Jan Bartel
7ecbd97588
418769 Allow resourceBases in run-forked Mojo
2013-11-21 16:55:45 +11:00
Joakim Erdfelt
9172d6115b
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:58:44 -07:00
Joakim Erdfelt
6feeab6ec3
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:58:36 -07:00
Joakim Erdfelt
7bbc0ff4df
[maven-release-plugin] rollback the release of jetty-9.1.0.v20131115
2013-11-15 16:33:52 -07:00
Joakim Erdfelt
1126e68971
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:03:28 -07:00
Joakim Erdfelt
d6418c73d4
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:03:20 -07:00
Joakim Erdfelt
6c372b9440
Reverting <version> to 9.1.0-SNAPSHOT
2013-11-15 15:36:26 -07:00
Jesse McConnell
b5345caed1
[maven-release-plugin] prepare for next development iteration
2013-11-14 15:27:52 -06:00
Jesse McConnell
1582aa196d
[maven-release-plugin] prepare release jetty-9.1.0.v20131114
2013-11-14 15:27:37 -06:00
Jesse McConnell
63f20d4518
[maven-release-plugin] prepare for next development iteration
2013-11-07 10:42:54 -06:00
Jesse McConnell
dc2fd1b9ce
[maven-release-plugin] prepare release jetty-9.1.0.RC2
2013-11-07 10:42:41 -06:00
Greg Wilkins
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
Jan Bartel
9d756dc018
294531 Unpacking webapp twice to the same directory name causes problems with updated jars in WEB-INF/lib
2013-10-28 15:25:21 +11:00
Jan Bartel
c5fe3bcfd3
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java
2013-10-21 17:27:45 +11:00
Jan Bartel
3f852cf3db
416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations by jetty-maven-plugin
2013-10-21 16:44:33 +11:00
Jan Bartel
278dab08b8
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
2013-10-14 17:03:02 +11:00
Jan Bartel
9a330dad1b
418767 run-forked goal ingores test scope dependencies with useTestScope=true
2013-10-14 16:51:59 +11:00
Jan Bartel
d505350a9f
418596 Faults in JARs during class scanning should report the jar that caused the problem
2013-10-04 11:02:06 +10:00
Jesse McConnell
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
Jesse McConnell
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
Jesse McConnell
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
Jesse McConnell
af2e6ff911
Merge branch 'master' into release-9
2013-09-30 12:28:04 -05:00
Jan Bartel
0400289826
417561 Refactor annotation related code - make annotation phase able to be multithreaded
2013-09-30 13:27:05 +10:00
Greg Wilkins
5f02620603
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
2013-09-30 13:20:13 +10:00
Jan Bartel
cb554948a2
417574 Setting options with _JAVA_OPTIONS breaks run-forked with <waitForChild>true</waitForChild>
2013-09-30 12:23:14 +10:00
Joakim Erdfelt
1fcede8b8b
Merge branch 'master' into jetty-9.1
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/MultiMapTest.java
2013-09-26 06:07:06 -07:00
Joakim Erdfelt
ac40e7ab6a
Fixing various javadoc errors
2013-09-25 08:11:32 -07:00
Joakim Erdfelt
a20b39e9ab
Fixing build error
2013-09-23 14:11:04 -07:00
Jesse McConnell
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
Jesse McConnell
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
Jan Bartel
d4c035a06f
417561 Refactor annotation related code to remove some deadwood
2013-09-19 15:43:38 +10:00
Jan Bartel
f44787075a
417382 - Upgrade to asm 4.1 and refactor annotation parsing
2013-09-17 13:12:54 +10:00
Simone Bordet
a23e899aff
Enabled JSR WebSocket out of the box.
2013-09-13 11:20:17 +02:00
Simone Bordet
c86ecc50fa
Fixed logger name and reduced logging level.
2013-09-13 11:20:17 +02:00
Greg Wilkins
070ce9dd22
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Jesse McConnell
ef166c23e6
Merge branch 'release-9'
2013-08-23 18:58:01 -05:00
Jan Bartel
a64319b9b1
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-22 20:11:08 +10:00
Jan Bartel
1ad9d6cff6
411934 War overlay configuration assumes src/main/webapp exists
2013-08-22 20:03:46 +10:00
Jan Bartel
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
Jan Bartel
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
Jan Bartel
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
Jan Bartel
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
Jan Bartel
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
Jesse McConnell
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
Jan Bartel
7dea4f85f9
414085 - Add jetty-continuations to plugin dependencies
2013-08-01 09:59:19 +10:00
Jan Bartel
bd2add0ae9
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
2013-07-12 13:53:58 +10:00
Greg Wilkins
a65ca7b5cd
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-11 14:45:16 +10:00
Jesse McConnell
ae3286f9fc
[Bug 412713] add dumpOnStart configuration to jetty-maven-plugin
2013-07-10 15:54:48 -05:00
Jan Bartel
fde47b1083
412637 ShutdownMonitorThread already started
2013-07-10 17:21:43 +10:00
Joakim Erdfelt
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
Joakim Erdfelt
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
Joakim Erdfelt
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
Jesse McConnell
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
Jesse McConnell
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
Greg Wilkins
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +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
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
Greg Wilkins
7bb3a7be28
409556 Resource files not closed
...
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.
FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
Jan Bartel
d581dac287
409684 Ids and properties not set for execution of jetty xml config files with mvn plugin
2013-06-03 12:34:37 +10:00
Greg Wilkins
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
Jesse McConnell
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
Jan Bartel
cbac0ea5fa
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-16 07:24:49 +10:00
Jan Bartel
79f6121894
407812 - jetty-maven-plugin can not handle whitespaces in equivalent of WEB-INF/classes paths
2013-05-13 17:51:12 +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
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
Jan Bartel
28d4f41572
405631 Plugin gives error when its started twice
2013-04-26 16:31:10 +10:00
Greg Wilkins
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +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
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
4951b1ccc4
404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath
2013-03-28 19:33:52 +11: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
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
Joakim Erdfelt
e950957950
[maven-release-plugin] prepare for next development iteration
2013-02-24 08:13:34 -07:00
Joakim Erdfelt
459e04d3b2
[maven-release-plugin] prepare release jetty-9.0.0.RC2
2013-02-24 08:13:26 -07:00
Jesse McConnell
a6c48312f6
[maven-release-plugin] prepare for next development iteration
2013-02-22 07:53:11 -06:00
Jesse McConnell
484162de79
[maven-release-plugin] prepare release jetty-9.0.0.RC1
2013-02-22 07:52:48 -06:00
Jesse McConnell
48e9e9c36c
[maven-release-plugin] prepare for next development iteration
2013-02-21 17:44:16 -06:00
Jesse McConnell
ca072f9c82
[maven-release-plugin] prepare release jetty-9.0.0.RC1
2013-02-21 17:43:59 -06:00
Jesse McConnell
85a9371c2e
[maven-release-plugin] prepare for next development iteration
2013-02-21 14:37:06 -06:00
Jesse McConnell
2b5abf7ed2
[maven-release-plugin] prepare release jetty-9.0.0.RC1
2013-02-21 14:36:57 -06:00
Jesse McConnell
95eefd5381
[maven-release-plugin] prepare for next development iteration
2013-02-21 11:10:53 -06:00
Jesse McConnell
399828d833
[maven-release-plugin] prepare release jetty-9.0.0.RC1
2013-02-21 11:10:35 -06:00
Jan Bartel
9be9910cde
227244 Remove import of backport-util-concurrent Arrays class
2013-02-20 09:34:30 +11: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
Jesse McConnell
a84f52d037
update jetty-maven-plugin to 1.7 compiler plugin (remove 1.5 actually)
2013-01-28 12:17:14 -06:00
Jesse McConnell
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
Greg Wilkins
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
Jan Bartel
d087a88caf
397114 run-forked with waitForChild=false can lock up
2013-01-10 17:52:07 +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
Jan Bartel
b819c07cc9
396474 add websocket server classes to jetty-maven-plugin classpath
2012-12-13 19:58:50 +11:00
Jan Bartel
d9b34930d5
396460 Make ServerConnector configurable with jetty-maven-plugin
2012-12-13 19:58:50 +11:00
Jan Bartel
2a5a8e0998
JETTY-846 Support maven-war-plugin configuration for jetty-maven-plugin; fix NPE
2012-11-19 13:52:34 +11:00
Jan Bartel
b000fa4f34
394545 Add jetty-jaas dependency to jetty-maven-plugin
2012-11-19 12:21:01 +11:00
Jan Bartel
fe773d22e1
JETTY-846 Support maven-war-plugin overlay configuration with jetty:run
2012-11-19 12:06:26 +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
Jesse McConnell
2ab0ef25bd
resolve issues between jetty 8 and jetty 9 maven plugin that jan noticed
2012-11-01 12:08:07 -05:00
Jan Bartel
8186794775
JETTY-1550 virtual WEB-INF not created if project has overlays
2012-11-01 15:37:17 +11:00
Jan Bartel
e466fa06b9
393291 Confusing log entry about (non) existing webAppSourceDirectory
2012-11-01 11:44:40 +11:00
Jesse McConnell
a1fa7d4fdd
update maven plugins tools api dependencies to something that will clear CQ
2012-10-18 11:15:29 -05:00
Joakim Erdfelt
857498b115
Upgrading to junit-dep-4.10.jar (banning junit.jar)
2012-09-20 11:52:59 -07:00
Greg Wilkins
129583679a
jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector
2012-09-17 17:37:56 +10:00
Simone Bordet
4de5b0ad63
Merged branch 'jetty-9' into jetty-9-client.
2012-08-30 17:24:49 +02:00
Jesse McConnell
2e81b63807
add jetty-jsp into build and add jetty-jspc-maven-plugin in as well
2012-08-29 11:08:52 -05:00
Jesse McConnell
79861eaa05
adding in jetty-maven-plugin
2012-08-28 09:35:45 -05:00