You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/10/20 11:21:41 UTC
[1/2] cxf git commit: No need to have explicit activation of the
metrics registry/jmx exporter given that MetricsFeature is auto-discovered,
as discussed with Andriy
Repository: cxf
Updated Branches:
refs/heads/master 57bb94e0a -> c208c9f16
No need to have explicit activation of the metrics registry/jmx exporter given that MetricsFeature is auto-discovered, as discussed with Andriy
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/58e2e478
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/58e2e478
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/58e2e478
Branch: refs/heads/master
Commit: 58e2e47803e784609effdaf3b04acfcf49d26430
Parents: d2dca67
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Oct 20 12:21:01 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Oct 20 12:21:01 2016 +0100
----------------------------------------------------------------------
.../java/sample/rs/service/SampleRestApplication.java | 14 --------------
1 file changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/58e2e478/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index 17f6fb0..ca9c445 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -17,27 +17,13 @@
* under the License.
*/
package sample.rs.service;
-import com.codahale.metrics.JmxReporter;
-import com.codahale.metrics.MetricRegistry;
-
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.context.annotation.Bean;
@SpringBootApplication
@EnableEurekaClient
public class SampleRestApplication {
- @Bean
- public MetricRegistry metricRegistry(){
- return new MetricRegistry();
- }
-
- @Bean(initMethod = "start", destroyMethod = "stop")
- public JmxReporter jmxReporter(MetricRegistry metricRegistry) {
- return JmxReporter.forRegistry(metricRegistry).build();
- }
-
public static void main(String[] args) {
SpringApplication.run(SampleRestApplication.class, args);
}
[2/2] cxf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c208c9f1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c208c9f1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c208c9f1
Branch: refs/heads/master
Commit: c208c9f16b2ca56166c91222fa6517999e40b9a2
Parents: 58e2e47 57bb94e
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Oct 20 12:21:27 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Oct 20 12:21:27 2016 +0100
----------------------------------------------------------------------
.../token/provider/SAMLProviderActAsTest.java | 63 ++++++++++++++++----
1 file changed, 52 insertions(+), 11 deletions(-)
----------------------------------------------------------------------