You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2017/09/09 08:11:51 UTC

[cxf] branch master updated: add new logging feature to samples

This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 4a8fd89  add new logging feature to samples
4a8fd89 is described below

commit 4a8fd89f8db1a4ee94b292dee996b7816bccb57e
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sat Sep 9 10:11:41 2017 +0200

    add new logging feature to samples
---
 .../jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
 .../jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml  | 2 +-
 .../src/main/java/sample/rs/service/SampleRestApplication.java       | 4 ++--
 .../src/main/resources/client-applicationContext.xml                 | 2 +-
 .../src/main/resources/server-applicationContext.xml                 | 2 +-
 distribution/src/main/release/samples/pom.xml                        | 5 +++++
 .../wsdl_first/src/main/resources/server-applicationContext.xml      | 2 +-
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
index a7466a7..650c7a3 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -30,7 +30,7 @@
          http://cxf.apache.org/schemas/jaxrs-client.xsd">
 
      <!-- CXF Logging Feature -->
-     <bean id="loggingFeature" class="org.apache.cxf.feature.LoggingFeature"/>
+     <bean id="loggingFeature" class="org.apache.cxf.ext.logging.LoggingFeature"/>
 
      <bean id="idTokenService" class="demo.jaxrs.server.IdTokenService"/>
      <jaxrs:server id="idTokenServer" address="/info">
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
index f3817d0..c406f97 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
@@ -30,7 +30,7 @@
          http://cxf.apache.org/schemas/jaxrs-client.xsd">
 
      <!-- CXF Logging Feature -->
-     <bean id="loggingFeature" class="org.apache.cxf.feature.LoggingFeature"/>
+     <bean id="loggingFeature" class="org.apache.cxf.ext.logging.LoggingFeature"/>
 
      <!-- 
         1. Big Query Client Application: 
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
index 79c8a1d..0c8e00f 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -18,10 +18,10 @@
  */
 package sample.rs.service;
 import java.util.Arrays;
-import java.util.Collections;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingFeature;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.swagger.Swagger2Feature;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +47,7 @@ public class SampleRestApplication {
         endpoint.setBus(bus);
         endpoint.setServiceBeans(Arrays.<Object>asList(new HelloServiceImpl1(), new HelloServiceImpl2()));
         endpoint.setAddress("/");
-        endpoint.setFeatures(Collections.singletonList(createSwaggerFeature()));
+        endpoint.setFeatures(Arrays.asList(createSwaggerFeature(), new LoggingFeature()));
         return endpoint.create();
     }
 
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml b/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml
index 782ac01..b34ae7b 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml
@@ -39,7 +39,7 @@
     	address="jms:queue:test.queue" 
     	serviceClass="com.example.customerservice.CustomerService">
         <jaxws:features>
-            <bean class="org.apache.cxf.feature.LoggingFeature"/>
+            <bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
             
             <!-- We use the feature to inject the ConnectionFactory. This approach also allows to publish
             	a java first service as we need no jms config in the wsdl.
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml b/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml
index d51cb13..8ea3f48 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml
@@ -39,7 +39,7 @@
     	address="jms:queue:test.queue" 
     	implementor="com.example.customerservice.server.CustomerServiceImpl">
         <jaxws:features>
-            <bean class="org.apache.cxf.feature.LoggingFeature"/>
+            <bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
             
             <!-- We use the feature to inject the ConnectionFactory. This approach also allows to publish
             	a java first service as we need no jms config in the wsdl.
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index e9014fa..89970f1 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -42,6 +42,11 @@
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-features-logging</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
     <modules>
         <module>in_jvm_transport</module>
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml b/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml
index 1c777ab..71e2296 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml
@@ -37,7 +37,7 @@
     <!-- HTTP Endpoint -->
     <jaxws:endpoint xmlns:customer="http://customerservice.example.com/" id="CustomerServiceHTTP" address="http://localhost:9090/CustomerServicePort" serviceName="customer:CustomerServiceService" endpointName="customer:CustomerServiceEndpoint" implementor="com.example.customerservice.server.CustomerServiceImpl">
         <jaxws:features>
-            <bean class="org.apache.cxf.feature.LoggingFeature"/>
+            <bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
         </jaxws:features>
     </jaxws:endpoint>
 </beans>

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].