Move the JmxModule into a modules package
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a6b55761 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a6b55761 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a6b55761 Branch: refs/heads/master Commit: a6b557612695cadd87708d1cc9173337a84d1a48 Parents: 2de3d0f Author: Howard M. Lewis Ship <[email protected]> Authored: Mon Apr 22 17:05:06 2013 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Mon Apr 22 17:05:06 2013 -0700 ---------------------------------------------------------------------- tapestry-jmx/build.gradle | 2 +- .../java/org/apache/tapestry5/jmx/JmxModule.java | 28 -------------- .../apache/tapestry5/jmx/modules/JmxModule.java | 30 +++++++++++++++ .../org/example/testapp/services/AppModule.java | 4 +- 4 files changed, 33 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a6b55761/tapestry-jmx/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-jmx/build.gradle b/tapestry-jmx/build.gradle index c451a93..465c74e 100644 --- a/tapestry-jmx/build.gradle +++ b/tapestry-jmx/build.gradle @@ -13,6 +13,6 @@ test { jar { manifest { - attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.jmx.JmxModule' + attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.jmx.modules.JmxModule' } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a6b55761/tapestry-jmx/src/main/java/org/apache/tapestry5/jmx/JmxModule.java ---------------------------------------------------------------------- diff --git a/tapestry-jmx/src/main/java/org/apache/tapestry5/jmx/JmxModule.java b/tapestry-jmx/src/main/java/org/apache/tapestry5/jmx/JmxModule.java deleted file mode 100644 index 2da03fe..0000000 --- a/tapestry-jmx/src/main/java/org/apache/tapestry5/jmx/JmxModule.java +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2010, 2011 The Apache Software Foundation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -package org.apache.tapestry5.jmx; - -import org.apache.tapestry5.internal.jmx.MBeanSupportImpl; -import org.apache.tapestry5.ioc.ServiceBinder; - -/** - * Module for JMX services. - */ -public class JmxModule -{ - public static void bind(ServiceBinder binder) - { - binder.bind(MBeanSupport.class, MBeanSupportImpl.class); - } -} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a6b55761/tapestry-jmx/src/main/java/org/apache/tapestry5/jmx/modules/JmxModule.java ---------------------------------------------------------------------- diff --git a/tapestry-jmx/src/main/java/org/apache/tapestry5/jmx/modules/JmxModule.java b/tapestry-jmx/src/main/java/org/apache/tapestry5/jmx/modules/JmxModule.java new file mode 100644 index 0000000..b4ba2d1 --- /dev/null +++ b/tapestry-jmx/src/main/java/org/apache/tapestry5/jmx/modules/JmxModule.java @@ -0,0 +1,30 @@ +// Copyright 2010-2013 The Apache Software Foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.apache.tapestry5.jmx.modules; + +import org.apache.tapestry5.internal.jmx.MBeanSupportImpl; +import org.apache.tapestry5.ioc.ServiceBinder; +import org.apache.tapestry5.jmx.MBeanSupport; + +/** + * Module for JMX services. + */ +public class JmxModule +{ + public static void bind(ServiceBinder binder) + { + binder.bind(MBeanSupport.class, MBeanSupportImpl.class); + } +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a6b55761/tapestry-jmx/src/test/java/org/example/testapp/services/AppModule.java ---------------------------------------------------------------------- diff --git a/tapestry-jmx/src/test/java/org/example/testapp/services/AppModule.java b/tapestry-jmx/src/test/java/org/example/testapp/services/AppModule.java index c946fb9..ca43f67 100644 --- a/tapestry-jmx/src/test/java/org/example/testapp/services/AppModule.java +++ b/tapestry-jmx/src/test/java/org/example/testapp/services/AppModule.java @@ -1,4 +1,4 @@ -// Copyright 2010, 2011 The Apache Software Foundation +// Copyright 2010-2013 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import org.apache.tapestry5.ioc.MappedConfiguration; import org.apache.tapestry5.ioc.ServiceBinder; import org.apache.tapestry5.ioc.annotations.Decorate; import org.apache.tapestry5.ioc.annotations.SubModule; -import org.apache.tapestry5.jmx.JmxModule; import org.apache.tapestry5.jmx.MBeanSupport; +import org.apache.tapestry5.jmx.modules.JmxModule; @SubModule(JmxModule.class) public class AppModule
