cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject cxf git commit: Remove warnings in services
Date Thu, 09 Feb 2017 18:47:11 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 9bb1148e0 -> 702389744


Remove warnings in services


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

Branch: refs/heads/master
Commit: 702389744199001e6c35e602ffb197ebaaf84838
Parents: 9bb1148
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Feb 9 13:41:20 2017 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Feb 9 13:41:20 2017 -0500

----------------------------------------------------------------------
 .../org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java     | 4 ++--
 services/sts/systests/advanced/pom.xml                         | 6 ++++++
 .../cxf/systest/sts/transformation/DoubleItPortTypeImpl.java   | 2 +-
 services/sts/systests/basic/pom.xml                            | 6 ++++++
 .../cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java  | 4 ++--
 .../cxf/systest/sts/stsclient/STSTokenRetrieverTest.java       | 4 ++--
 .../org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java     | 3 ---
 7 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/70238974/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java
index 2d1261a..bc63502 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java
@@ -86,11 +86,11 @@ public class JexlClaimsMapper implements ClaimsMapper {
         return script;
     }
 
-    public void setScript(Script script) {
+    public final void setScript(Script script) {
         this.script = script;
     }
 
-    public void setScript(String scriptLocation) throws IOException {
+    public final void setScript(String scriptLocation) throws IOException {
         URL resource = ClassLoaderUtils.getResource(scriptLocation, this.getClass());
         if (resource != null) {
             scriptLocation = resource.getPath();

http://git-wip-us.apache.org/repos/asf/cxf/blob/70238974/services/sts/systests/advanced/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml
index 0735aa7..0cade9f 100644
--- a/services/sts/systests/advanced/pom.xml
+++ b/services/sts/systests/advanced/pom.xml
@@ -104,6 +104,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-features-logging</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/70238974/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
index 4c3e44f..1ac9823 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
@@ -38,7 +38,7 @@ import org.junit.Assert;
 @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", 
             serviceName = "DoubleItService", 
             endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
-@Features(classes = org.apache.cxf.feature.LoggingFeature.class)              
+@Features(classes = org.apache.cxf.ext.logging.LoggingFeature.class)              
 public class DoubleItPortTypeImpl implements DoubleItPortType {
     
     @Resource

http://git-wip-us.apache.org/repos/asf/cxf/blob/70238974/services/sts/systests/basic/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/pom.xml b/services/sts/systests/basic/pom.xml
index 2ca6d9f..eb633a4 100644
--- a/services/sts/systests/basic/pom.xml
+++ b/services/sts/systests/basic/pom.xml
@@ -97,6 +97,12 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-features-logging</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
             <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/70238974/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
index 8b7ab11..bb721a0 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
@@ -43,8 +43,8 @@ import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.endpoint.EndpointImpl;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;

http://git-wip-us.apache.org/repos/asf/cxf/blob/70238974/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
index a8ad265..6d7d309 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
@@ -43,8 +43,8 @@ import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.endpoint.EndpointImpl;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;

http://git-wip-us.apache.org/repos/asf/cxf/blob/70238974/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
----------------------------------------------------------------------
diff --git a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
index 3673206..3d086b8 100644
--- a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
+++ b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
@@ -38,7 +38,6 @@ import javax.xml.ws.wsaddressing.W3CEndpointReference;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.cxf.ws.discovery.internal.WSDiscoveryServiceImpl;
@@ -144,7 +143,6 @@ public final class WSDiscoveryClientTest {
         
         
         Bus bus  = BusFactory.newInstance().createBus();
-        new LoggingFeature().initialize(bus);
         WSDiscoveryClient c = new WSDiscoveryClient(bus);
         c.setVersion10();
         c.setAddress("soap.udp://239.255.255.250:" + PORT);
@@ -179,7 +177,6 @@ public final class WSDiscoveryClientTest {
             HelloType h = service.register(ep.getEndpointReference());
             
             bus  = BusFactory.newInstance().createBus();
-            new LoggingFeature().initialize(bus);
             WSDiscoveryClient c = new WSDiscoveryClient(bus);
             c.setVersion10();
             


Mime
View raw message