cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-7164] Moving BraveFeature into a brave package
Date Thu, 29 Dec 2016 11:00:29 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 73d1f886a -> 3be1cef6d


[CXF-7164] Moving BraveFeature into a brave package


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3be1cef6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3be1cef6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3be1cef6

Branch: refs/heads/master
Commit: 3be1cef6d16eeee405b7e046c822c27dc7223f24
Parents: 73d1f88
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Dec 29 11:00:11 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Dec 29 11:00:11 2016 +0000

----------------------------------------------------------------------
 integration/tracing/tracing-brave/pom.xml       |  2 +-
 .../apache/cxf/tracing/brave/BraveFeature.java  | 51 +++++++++++++++++++
 .../cxf/tracing/brave/jaxws/BraveFeature.java   | 53 --------------------
 .../cxf/tracing/brave/BraveTraceTest.java       |  2 +-
 4 files changed, 53 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/3be1cef6/integration/tracing/tracing-brave/pom.xml
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/pom.xml b/integration/tracing/tracing-brave/pom.xml
index b105b47..74363bd 100644
--- a/integration/tracing/tracing-brave/pom.xml
+++ b/integration/tracing/tracing-brave/pom.xml
@@ -58,7 +58,7 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${project.version}</version>
-            <optional>true</optional>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/3be1cef6/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
new file mode 100644
index 0000000..7b352bf
--- /dev/null
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.cxf.tracing.brave;
+
+import com.github.kristofa.brave.Brave;
+import com.github.kristofa.brave.http.DefaultSpanNameProvider;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.annotations.Provider;
+import org.apache.cxf.annotations.Provider.Type;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.interceptor.InterceptorProvider;
+
+@NoJSR250Annotations
+@Provider(value = Type.Feature)
+public class BraveFeature extends AbstractFeature {
+    private BraveStartInterceptor in;
+    private BraveStopInterceptor out;
+
+    public BraveFeature(Brave brave) {
+        DefaultSpanNameProvider nameProvider = new DefaultSpanNameProvider();
+        in = new BraveStartInterceptor(brave, nameProvider);
+        out = new BraveStopInterceptor(brave, nameProvider);
+    }
+
+    @Override
+    protected void initializeProvider(InterceptorProvider provider, Bus bus) {
+        provider.getInInterceptors().add(in);
+        provider.getInFaultInterceptors().add(in);
+
+        provider.getOutInterceptors().add(out);
+        provider.getOutFaultInterceptors().add(out);
+    }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/3be1cef6/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
deleted file mode 100644
index 876d026..0000000
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.cxf.tracing.brave.jaxws;
-
-import com.github.kristofa.brave.Brave;
-import com.github.kristofa.brave.http.DefaultSpanNameProvider;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.annotations.Provider;
-import org.apache.cxf.annotations.Provider.Type;
-import org.apache.cxf.common.injection.NoJSR250Annotations;
-import org.apache.cxf.feature.AbstractFeature;
-import org.apache.cxf.interceptor.InterceptorProvider;
-import org.apache.cxf.tracing.brave.BraveStartInterceptor;
-import org.apache.cxf.tracing.brave.BraveStopInterceptor;
-
-@NoJSR250Annotations
-@Provider(value = Type.Feature)
-public class BraveFeature extends AbstractFeature {
-    private BraveStartInterceptor in;
-    private BraveStopInterceptor out;
-
-    public BraveFeature(Brave brave) {
-        DefaultSpanNameProvider nameProvider = new DefaultSpanNameProvider();
-        in = new BraveStartInterceptor(brave, nameProvider);
-        out = new BraveStopInterceptor(brave, nameProvider);
-    }
-
-    @Override
-    protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-        provider.getInInterceptors().add(in);
-        provider.getInFaultInterceptors().add(in);
-
-        provider.getOutInterceptors().add(out);
-        provider.getOutFaultInterceptors().add(out);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/3be1cef6/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
index 7ba28c3..3c4b3d4 100644
--- a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
+++ b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
@@ -27,7 +27,7 @@ import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.feature.Feature;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import org.apache.cxf.tracing.brave.jaxws.BraveFeature;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;


Mime
View raw message