Greg Wilkins
b3be247423
merged quickstart changes
2014-03-14 13:07:00 +11:00
Jan Bartel
b6f36dadb2
Add appropriate headers to allow ServiceLoader mechanism to work with OSGi.
2014-03-10 13:42:05 +11:00
Greg Wilkins
18e19260ff
Apply changes resulting from the quickstart project
2014-02-13 12:31:14 +11:00
Joakim Erdfelt
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
Jan Bartel
aca8e4d44c
424380 Augment class / Jar scanning timing log events
2013-12-20 11:00:46 +11:00
Jan Bartel
2d3d912173
423361 Ensure ServletContainerInitializers called before injecting Listeners
2013-12-13 15:03:46 +11:00
Jan Bartel
dfe5889bc4
423361 Make all listeners injectable irrespective of method of declaration (descriptor, api, annotation)
2013-12-12 14:44:38 +11:00
Jan Bartel
8b544e4327
423556 HttpSessionIdListener should be resource injectable
2013-12-09 17:05:52 +11:00
Jan Bartel
5f204b8812
423395 Ensure @WebListeners are injected
2013-12-06 15:46:51 +11:00
Greg Wilkins
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
Jan Bartel
fc6493b5b1
Remove accidental checkin of println
2013-10-28 13:09:26 +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
b9020d200a
419655 AnnotationParser throws NullPointerException when scanning files from jar:file urls
2013-10-21 16:42:27 +11:00
Jan Bartel
557b12a082
416300 Order ServletContainerInitializer callbacks
2013-10-17 18:37:24 +11:00
Joakim Erdfelt
a1775c4415
Fixing javadoc
2013-10-07 11:59:04 -07: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
Jan Bartel
92233ebf83
417561 Refactor annotation related code: change log messages
2013-09-30 13:27:05 +10:00
Jan Bartel
afb1b69171
Add some more timing instrumentation to annotation related processing
2013-09-30 13:27:05 +10:00
Jan Bartel
df336f3476
417561 Refactor annotation related code - remove unneeded log statements
2013-09-30 13:27:05 +10:00
Jan Bartel
0400289826
417561 Refactor annotation related code - make annotation phase able to be multithreaded
2013-09-30 13:27:05 +10:00
Joakim Erdfelt
ac40e7ab6a
Fixing various javadoc errors
2013-09-25 08:11:32 -07:00
Jan Bartel
911f271817
417561 Refactor annotation related code
...
Log a warning if not able to check valid classname when scanning a directory (wars that are not unpacked are still able to be scanned even though Resource.getFile().getName() will return null).
2013-09-20 18:08:19 +10:00
Jan Bartel
73d0ed8d71
417561 Refactor annotation related code
...
Rename and refactor ServletContainerInitializerListener
2013-09-19 22:31:36 +10: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
Jan Bartel
810fbdc439
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-09-05 18:31:53 +10:00
Jan Bartel
b8a4bf37e6
416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations
2013-09-05 18:24:12 +10:00
Jesse McConnell
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
Jesse McConnell
725e405dac
first pass for mod files for distribution
2013-08-22 11:53:58 -05:00
Joakim Erdfelt
1abad26e99
Fixing malformed Javadoc warnings in jetty-annotations
2013-08-14 12:46:25 -07:00
Greg Wilkins
e0382bc4ae
414740 Removed the parent peeking Loader
2013-08-09 17:53:43 +10:00
Jan Bartel
06ef5b7930
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
2013-08-09 15:59:29 +10:00
Jan Bartel
b17696325b
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-08-09 15:14:09 +10:00
Jan Bartel
6a22a9f5b9
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-08-09 14:46:25 +10:00
Jan Bartel
66620b77b8
414507 Ensure AnnotationParser ignores parent dir hierarchy when checking for hidden dirnames
2013-08-09 14:19:04 +10:00
Joakim Erdfelt
012804bdd9
414725 - Annotation Scanning should exclude webapp basedir from path validation checks
...
+ Checking in @Ignore'd test demonstrating the bug
2013-08-08 15:05:31 -07:00
Jan Bartel
1f3ec4b538
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-08 14:31:33 +10:00
Jan Bartel
bd1b19b45c
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
2013-08-08 14:24:19 +10:00
Jan Bartel
f22217392b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-08-08 12:28:51 +10:00
Jan Bartel
f983629434
414507 AnnotationParser should skip classes in hidden dirs or with . name prefix
2013-08-08 12:09:29 +10:00
Joakim Erdfelt
941989e5cb
Tweaking generics.
2013-07-26 14:04:17 -07:00
Joakim Erdfelt
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07:00
Joakim Erdfelt
998643587d
Merge from [master] to [javawebsocket-jsr]
2013-05-30 16:44:50 -07:00
Greg Wilkins
b59949253d
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
2013-05-30 17:17:54 +10:00
Jan Bartel
c53efbaff4
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
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/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/AbstractCompressedStream.java
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/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-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-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/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/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-05-30 15:36:38 +10:00
Jan Bartel
c869aad145
409436 NPE on context restart using dynamic servlet registration
2013-05-30 15:16:43 +10:00
Greg Wilkins
10539d5a3f
fixed NPE in injection
2013-05-29 09:14:27 +10:00
Greg Wilkins
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
Joakim Erdfelt
598ecd7d7f
Merge branch 'master' into javawebsocket-jsr
2013-05-22 09:25:06 -07:00
Jesse McConnell
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00