Commit Graph

114 Commits

Author SHA1 Message Date
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
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Greg Wilkins 8c3fa91b26 jetty-9 reverted to more start.ini rather than start.d usage as we will not be using plugins. More configuration documentation added 2012-10-11 16:15:57 +11:00
Greg Wilkins 950249932d jetty-9 improved mbean names 2012-09-21 18:00:46 +10:00
Greg Wilkins 68ee346b8a jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle 2012-09-21 11:45:51 +10:00
Simone Bordet 40382bad3a jetty-9 - Removed references to JUnit 3.x. 2012-09-20 18:23:02 +02:00
Greg Wilkins 2dfcebfc04 jetty-9 distribution working 2012-09-06 14:54:55 +10:00
Simone Bordet d7d5e4f20e Jetty9 - Reduced test logging. 2012-08-29 22:42:35 +02:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Jesse McConnell 6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jesse McConnell b7407000cb fix logging bits 2012-08-14 17:30:28 -05:00
Jesse McConnell 1357c342d8 fix logging bits 2012-08-14 17:29:32 -05:00
Jesse McConnell 5c3a1cfe8c removed the wrapper element from the ManagedObject annotation, rejiggered object mbean to not need wrapper, also smoking the convert concept in objectMbean in favor of dynamically discovering it where needed since its easy with annotations 2012-08-14 16:52:17 -05:00
Jesse McConnell 447b9ecee5 suppress duplicate attributes in the influence chain 2012-08-14 10:09:13 -05:00
Jesse McConnell aae7c4da68 removed managed=true from ManagedOperation and ManagedAttribute 2012-08-13 17:19:59 -05:00
Jesse McConnell 74f8822e64 remove managed=true need for ManagedOperation 2012-08-13 16:50:15 -05:00
Jesse McConnell 11dbce81c8 wire up way to remove the need for managed=true on ManagedAttribute 2012-08-13 16:48:52 -05:00
Jesse McConnell 752a2e7d64 more annotation jmx jiggering 2012-08-10 17:23:59 -05:00
Jesse McConnell 553cf0f404 simone added an attribute to abstractlifecycle increasing the attribute count on influences 2012-08-10 16:33:45 -05:00
Jesse McConnell 4d74adc1e5 ignore test 2012-08-10 10:48:44 -05:00
Jesse McConnell f92ebea9f0 updates to managed attribute, tests, objectmbean impl and a note to improve id as viewed in jconsole 2012-08-10 10:29:09 -05:00
Greg Wilkins 32c5f6c093 jetty-9 reduced LazyList usage 2012-08-08 11:58:50 +10:00
Jesse McConnell 6c0bb390ae adding in some more test cases which now include the MBeanContainer 2012-08-03 16:05:04 -05:00