Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,092 Commits 67 Branches 465 Tags 359 MiB
Commit Graph

10092 Commits

Author SHA1 Message Date
Joakim Erdfelt ed594425d3 Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-server/src/main/config/etc/jetty.xml
	jetty-server/src/main/config/modules/server.mod
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2014-11-25 12:09:21 -07:00
Joakim Erdfelt 07647e8a5f 443652 - Remove dependency on java.lang.management classes 
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
   - Server.java
   - Log.java
   - AbstractLifeCycle.java
 2014-11-25 08:25:35 -07:00
Greg Wilkins f853adb43c fixed debug 2014-11-21 16:01:31 +11:00
Greg Wilkins ed0954f6d6 ignore bad test 2014-11-21 10:53:57 +11:00
Joakim Erdfelt 1d12decce7 changing .getEnabled() to .getSelected() 2014-11-20 16:25:00 -07:00
Joakim Erdfelt 9ea0b74f73 Tweaking output of selected modules tree in --list-modules to be more clear 2014-11-20 16:25:00 -07:00
Greg Wilkins 8e9e29f887 452188 Delay dispatch until content optimisation 
Make delay the default
 2014-11-21 10:02:24 +11:00
Greg Wilkins 121a8b6ee8 improved debugging 2014-11-21 10:00:18 +11:00
Joakim Erdfelt 69daa8d76d Cleanup of no longer needed code. 
+ Removing Modules.normalizeDependencies()
+ Using Modules.resolveNode() instead
+ Chaning Modules.resolveNode() to not throw Exception
 2014-11-20 09:53:02 -07:00
Joakim Erdfelt df9414eab2 Making test failure message more meaningful (including full stacktrace) 2014-11-20 09:52:33 -07:00
Joakim Erdfelt 2020e07243 Removing test noise 2014-11-20 09:52:10 -07:00
Simone Bordet f7df8f9244 452516 - Make HttpOutput aggregation size configurable. 
Introduced new property "outputAggregationSize" in HttpConfiguration,
and correspondent property in XML file.
 2014-11-20 17:06:10 +01:00
Simone Bordet 8330fa73e0 452188 Delay dispatch until content optimisation. 
Renamed property "delayDispatchUntilContent".
 2014-11-20 17:06:10 +01:00
Joakim Erdfelt 1604cffc0b Fixing HowUniquePredicate 2014-11-20 08:48:35 -07:00
Joakim Erdfelt 9bd0ce1938 452503 - Start.jar --add-to-start=jstl results in GraphException: Unable to expand property in name: jsp-impl/${jsp-impl}-jstl 
+ Preserving [depend] declaration order by switching from Set to List
 + Switching from BFS based selection / resolve logic in node selection
   to DFS based, to allow parent nodes to resolve completely before
   attempting other parent nodes.
 2014-11-20 08:32:55 -07:00
Joakim Erdfelt 91b8a889e3 Adding more temp files to gitignore 2014-11-20 08:02:00 -07:00
Simone Bordet 57f90ae7d1 452465 - 100% CPU spin on page reload. 
Fixed by adding a MetaData.recycle() method that properly recycles
the MetaData.Request object so that HttpChannelOverHttp.earlyEOF()
properly closes the connection when it's idle.
 2014-11-20 13:00:02 +01:00
Simone Bordet 2eb6e06387 Added required property "jsp-impl" set to "apache" to build the distro. 2014-11-20 12:57:47 +01:00
Greg Wilkins ab2e9c357f Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
 2014-11-20 16:34:30 +11:00
Greg Wilkins 1915e592b5 452424 Do not add Date header if already set 2014-11-20 15:33:22 +11:00
Greg Wilkins 46a5ef861d 447472 Clear async context timeout on async static content 2014-11-20 11:41:11 +11:00
Joakim Erdfelt 466fce4b80 452329 - Transitive modules in start.jar --add-to-start(d) are not added if enabled already in tree 
+ Modules can now be re-added.
  based on the node.selection.how == name
           and all other node selections must
            be node.selection.explicit == false
 2014-11-19 17:32:12 -07:00
Joakim Erdfelt 9d3852cb98 Fixing build 2014-11-19 17:00:48 -07:00
Joakim Erdfelt 7b5b81e76f Ignoring failing test 2014-11-19 17:00:27 -07:00
Joakim Erdfelt d786c4a57e 452322 - Restore progress messages for --add-to-start(d) use 2014-11-19 16:57:52 -07:00
Joakim Erdfelt f792c900ed Making setup demo-base actions split for --add-to-start, then --add-to-startd to avoid ambiguous action on transitive nodes 2014-11-19 16:44:43 -07:00
Joakim Erdfelt 89baf907b6 452323 - Start --list-config makes no hint on transitive enabled modules 
+ Eliminating lots of now dead code (#uncoding)
+ Making ambiguous add detection more sane.
 2014-11-19 16:42:55 -07:00
Joakim Erdfelt 005b513653 452323 - Start --list-config makes no hint on transitive enabled modules 
+ Refactoring out the Graph + Node logic into its own package
+ Changing Matcher to Predicate
+ Introducing new Node.selection Set which tracks how the various nodes
  are selected, along with with ability to track directly selected (aka
  explicit) vs transitive.
+ Module now extends from Node
+ Modules now extends from Graph<Module>
 2014-11-19 15:59:54 -07:00
Joakim Erdfelt 1561de0f81 Cleaning up resolveEnabled() deprecation 2014-11-19 10:27:25 -07:00
Jan Bartel a0f6d07847 452201 EnvConfiguration.destroy() should set the classloader 2014-11-19 17:49:16 +11:00
Jan Bartel 9792cec6db 451529 Change sentinel class for finding jstl on classpath to org.apache.taglibs.standard.tag.rt.core.WhenTag 2014-11-19 17:20:55 +11:00
Greg Wilkins aeccef2154 Merge remote-tracking branch 'origin/jetty-9.2.x' 
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
	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-cdi/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-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
	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-quickstart/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-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-11-19 13:37:48 +11:00
Greg Wilkins c334e81416 452188 Delay dispatch until content optimisation 
Added module and xml support
 2014-11-19 11:26:07 +11:00
Greg Wilkins 04f74f73a5 452188 Delay dispatch until content optimisation 2014-11-19 11:11:48 +11:00
Joakim Erdfelt d4d6cfdfa7 Removing virtual module [ssl-protonego] 
+ This virtual module, rolled the ssl + protonego + (xml) into
  http2 & spdy modules instead.
 2014-11-17 14:08:19 -07:00
Joakim Erdfelt 88900593de Fixing 2 typos 2014-11-17 13:56:55 -07:00
Joakim Erdfelt 994f00102d Merge branch 'start-init-improvements' 2014-11-17 13:22:53 -07:00
Joakim Erdfelt dbf6f2e644 451973 - Ambiguous module init location when mixing --add-to-start & --add-to-startd in the same exec 
+ Cleaning up entire base buildout into BaseBuilder class
+ The management of the configuration is maintained in
  - StartDirBuilder
  - StartIniBuilder
+ The buildout of the directories from the [files] section is now
  maintained by the BaseBuilder itself.
+ Using new FileInitializer system as well
+ Using new Licensing system as well
 2014-11-17 13:21:01 -07:00
Joakim Erdfelt 61e480c2c1 451974 - Combine multiple start license acknowledgement into one 
+ Initial work to combine licensing into a single event
  Depends on work from bug #451973
 2014-11-17 13:20:12 -07:00
Joakim Erdfelt 453ab6d5c7 Supporting optional use of maven local repository for download content 2014-11-14 12:15:07 -07:00
Joakim Erdfelt 28059d9644 Updating NPN test for valid module urls 2014-11-14 10:45:54 -07:00
Joakim Erdfelt cf90c683cd Merge branch 'master' into start-init-improvements 2014-11-14 10:03:03 -07:00
Joakim Erdfelt 844a209823 Updating all non-test maven.org refs to maven:// 2014-11-14 10:02:46 -07:00
Joakim Erdfelt ccaddc5d43 Working on utility to update maven refs 2014-11-14 09:53:18 -07:00
Joakim Erdfelt 24adca89ac Removing weld.mod (in favor of cdi.mod) 2014-11-14 06:30:01 -07:00
Greg Wilkins ce4af5a8b9 Implemented the PROXY protocol 
Added XML templates
 2014-11-14 12:04:57 +11:00
Greg Wilkins 5b60e0c98d support h2-15 and h2-14 2014-11-14 10:53:37 +11:00
Greg Wilkins 593cb39059 Implemented the PROXY protocol 
Removed old HttpParser PROXY tests
 2014-11-14 10:28:04 +11:00
Greg Wilkins a62f68e438 Added 421 MISDIRECTED_REQUEST 2014-11-14 09:46:46 +11:00
Joakim Erdfelt 15bf5b02f8 Updating Main.initFiles() to be extensible 2014-11-13 14:23:26 -07:00