138 Commits

Author SHA1 Message Date
Simone Bordet
07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03ddda3776f3db71e28e55312b1c982092, reversing
changes made to 4565c186d7491a97d72217a96e86b15ced506de6.
2017-01-19 18:26:43 +01:00
Jesse McConnell
53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
dreis2211
9b0f6b1fd5 Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
(cherry picked from commit 16334c1893cc45a6a811cc7c6f2552a861643dac)
2016-11-30 09:36:30 +11:00
Greg Wilkins
f856107301 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-31 19:05:57 +10:00
Greg Wilkins
0155ae761c Issue #880 Improve IPv6 support
For #880 added the HostPort class, which was used to fix #878, #879, #884 and #886
2016-08-31 16:46:11 +10:00
Greg Wilkins
9c9da42129 Fixes #851 - MBeanContainer no longer unregisters MBeans when "stopped".
MBeanContainer now implements Destroyable, so calling Server.destroy()
unregisters the MBeans.
2016-08-18 15:58:25 +10:00
Simone Bordet
64644183a8 Renamed test class. 2016-08-17 21:40:23 +02:00
Simone Bordet
00a065b064 Fixes #855 - JMXify MBeanContainer. 2016-08-17 21:28:19 +02:00
Simone Bordet
fe038c5a87 Fixes #851 - MBeanContainer no longer unregisters MBeans when "stopped".
MBeanContainer now implements Destroyable, so calling Server.destroy()
unregisters the MBeans.
2016-08-17 21:28:19 +02:00
Simone Bordet
e09396db4e Issue #298 (qtp threads spin-locked in MBeanContainer.beanAdded).
Replaced WeakHashMap with ConcurrentMap.
The "weak" features of WHM were not used anyway.
2016-02-19 16:32:44 +01:00
Greg Wilkins
5ddb176f6b Issue #298 spin-locked in MBeanContainer
protected the _beans map with a Lock
2016-02-17 16:07:31 +01:00
Joakim Erdfelt
cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt
b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Joakim Erdfelt
7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt
916efd6aa7 469860 - Add module metadata versioning to support backwards compat
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
Greg Wilkins
dc3b4d01f4 467289 - Not possible to specify jmxrmi port value 2015-05-14 09:55:42 +10:00
Greg Wilkins
5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Joakim Erdfelt
c9d8d07a63 464727 - Update Javadoc for Java 8 DocLint 2015-04-22 14:21:53 -07:00
Simone Bordet
599ab9bb1b 460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>".

Updated all references with new properties.
2015-04-13 16:21:48 +02:00
Greg Wilkins
e3d380bb7d 461941 JMX Remote host:port set from start properties 2015-03-12 13:41:18 +11:00
Joakim Erdfelt
3f08e54a23 457696 - JMX implementation should not be overridden by WebApp classes
+ Marking org.eclipse.jetty.util.annotation. for hole punching
+ Making ContextHandler parsing of "org.eclipse.jetty.server.context.ManagedAttributes"
  more lenient to whitespace around delimitors
+ Making ObjectMBean take in account the .jmx.{name}MBean for
  annotation influences too.
2015-01-16 15:18:01 -07:00
Joakim Erdfelt
6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Greg Wilkins
3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Simone Bordet
3ff4195dbc Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[]. 2014-06-25 12:26:45 +02:00
Joakim Erdfelt
b835aab06f 430825 - jetty-start / use of jetty-jmx.xml prevents configuration of ThreadPool in jetty.xml
+ Flipped dependencies around from:
     server -(optional) -> jmx
  to:
     jmx -> server
2014-03-26 11:59:59 -07:00
Joakim Erdfelt
a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Greg Wilkins
d04a96084d 422398 - moved jmx remote config to jmx-remote.mod 2013-11-25 14:20:41 +11:00
Greg Wilkins
f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Joakim Erdfelt
5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Joakim Erdfelt
5c850a9bbb 420103 - Split out jmx-remote module from existing jmx module
+ modules/jmx.mod not changed
+ etc/jetty-jmx.xml simplified greatly
+ etc/jetty-jmx-remote.xml contains specifics for making jmx listen on
  the port specified in properties
+ new modules/jmx-remote.mod for enabling this feature
2013-10-24 12:31:08 -07:00
Greg Wilkins
6f0eee6ba4 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-12 15:12:43 +10:00
Greg Wilkins
423dc1e443 416990 JMX names statically unique
Concurrent access to counter
2013-09-12 12:52:28 +10:00
Greg Wilkins
e4035f8cf2 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
2013-09-12 11:08:03 +10:00
Greg Wilkins
c842c5c505 416990 JMX names statically unique 2013-09-12 10:40:26 +10:00
Greg Wilkins
ace43502ad refined start.jar mechanism to align with updated documentation 2013-09-06 16:10:03 +10:00
Jesse McConnell
ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Greg Wilkins
d66778ad06 415826 start.jar module --enable and --disable
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
Jesse McConnell
725e405dac first pass for mod files for distribution 2013-08-22 11:53:58 -05:00
Joakim Erdfelt
ddafacf765 Fixing malformed Javadoc warnings in jetty-jmx 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
Jesse McConnell
74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Greg Wilkins
d4ad2ccfc7 401641 Fixed MBean setter for String[] 2013-02-25 13:28:39 +11:00
Simone Bordet
209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Jesse McConnell
e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell
a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins
27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Jesse McConnell
12075f7196 [Bug 395168] fix unavailable attributes when return type has annotation
on super class
2012-11-29 15:01:48 -06: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