cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Removing unnecessary code
Date Wed, 13 May 2015 13:32:50 GMT
Repository: cxf
Updated Branches:
  refs/heads/master b283eeb95 -> f43006429


Removing unnecessary code


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

Branch: refs/heads/master
Commit: f43006429fd5a4f711291118b3b8524cf1784cfe
Parents: b283eeb
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed May 13 14:32:32 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed May 13 14:32:46 2015 +0100

----------------------------------------------------------------------
 .../ws/rm/DecoupledClientServerOnewayTest.java       | 15 ++-------------
 .../cxf/systest/ws/rm/DecoupledClientServerTest.java | 15 ++-------------
 2 files changed, 4 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f4300642/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java
index 11b757e..6d69fc8 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java
@@ -75,8 +75,7 @@ public class DecoupledClientServerOnewayTest extends AbstractBusClientServerTest
             
             ep = Endpoint.create(implementor);
             Map<String, Object> properties = new HashMap<String, Object>();
-            properties.put(Message.SCHEMA_VALIDATION_ENABLED,
-                           shouldValidate());
+            properties.put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE);
             ep.setProperties(properties);
             ep.publish(address);
 
@@ -94,16 +93,6 @@ public class DecoupledClientServerOnewayTest extends AbstractBusClientServerTest
                    launchServer(Server.class, true));
     }
             
-    public static Boolean shouldValidate() {
-        String ver = System.getProperty("java.version");
-        if (ver.startsWith("1.5.0_0")) {
-            //older versions of the JDK have a bug in the parser
-            //that prevent the validation from actually working
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
-    
     @Test
     public void testDecoupledOneway() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
@@ -122,7 +111,7 @@ public class DecoupledClientServerOnewayTest extends AbstractBusClientServerTest
         final Greeter greeter = gs.getGreeterPort();
         updateAddressPort(greeter, PORT);
         ((BindingProvider)greeter).getRequestContext().put(Message.SCHEMA_VALIDATION_ENABLED,

-                                                           shouldValidate());
+                                                           Boolean.TRUE);
         LOG.fine("Created greeter client.");
        
         ConnectionHelper.setKeepAliveConnection(greeter, true);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f4300642/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
index dce6c8d..6e08ec5 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
@@ -73,8 +73,7 @@ public class DecoupledClientServerTest extends AbstractBusClientServerTestBase
{
             
             ep = Endpoint.create(implementor);
             Map<String, Object> properties = new HashMap<String, Object>();
-            properties.put(Message.SCHEMA_VALIDATION_ENABLED,
-                           shouldValidate());
+            properties.put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE);
             ep.setProperties(properties);
             ep.publish(address);
 
@@ -92,16 +91,6 @@ public class DecoupledClientServerTest extends AbstractBusClientServerTestBase
{
                    launchServer(Server.class, true));
     }
             
-    public static Boolean shouldValidate() {
-        String ver = System.getProperty("java.version");
-        if (ver.startsWith("1.5.0_0")) {
-            //older versions of the JDK have a bug in the parser
-            //that prevent the validation from actually working
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
-    
     @Test
     public void testDecoupled() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
@@ -118,7 +107,7 @@ public class DecoupledClientServerTest extends AbstractBusClientServerTestBase
{
         final Greeter greeter = gs.getGreeterPort();
         updateAddressPort(greeter, PORT);
         ((BindingProvider)greeter).getRequestContext().put(Message.SCHEMA_VALIDATION_ENABLED,

-                                                           shouldValidate());
+                                                           Boolean.TRUE);
         LOG.fine("Created greeter client.");
        
         ConnectionHelper.setKeepAliveConnection(greeter, true);


Mime
View raw message