[jbossws-commits] JBossWS SVN: r10869 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: resources/jaxws/cxf/wsrm and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2009-10-09 06:06:26 -0400 (Fri, 09 Oct 2009)
New Revision: 10869

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml
Log:
[CXF-1319][CXF-1318] Removing workarounds


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java	2009-10-08 17:48:03 UTC (rev 10868)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java	2009-10-09 10:06:26 UTC (rev 10869)
@@ -24,7 +24,6 @@
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Service;
 
 import junit.framework.Test;
@@ -67,10 +66,6 @@
       Service service = Service.create(wsdlURL, serviceName);
       BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class);
 
-      // Enable addressing
-      BindingProvider bp = (BindingProvider)port;
-      bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
-
       Object retObj = port.echo("Hello");
       assertEquals("Hello", retObj);
    }

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java	2009-10-08 17:48:03 UTC (rev 10868)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java	2009-10-09 10:06:26 UTC (rev 10869)
@@ -24,7 +24,6 @@
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Service;
 
 import junit.framework.Test;
@@ -67,10 +66,6 @@
       Service service = Service.create(wsdlURL, serviceName);
       BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class);
 
-      // Enable addressing
-      BindingProvider bp = (BindingProvider)port;
-      bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
-
       Object retObj = port.echo("Hello");
       assertEquals("Hello", retObj);
    }

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml	2009-10-08 17:48:03 UTC (rev 10868)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml	2009-10-09 10:06:26 UTC (rev 10869)
@@ -16,12 +16,12 @@
   </bean>
   <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/>
   
-  <!--p:engine enabled="true" ignoreUnknownAssertions="true"/-->
+  <p:engine enabled="true" ignoreUnknownAssertions="true"/>
   
   <cxf:bus name="cxf">
-    <!--cxf:features>
+    <cxf:features>
       <p:policies ignoreUnknownAssertions="true"/>
-    </cxf:features-->
+    </cxf:features>
     <cxf:inInterceptors>
       <ref bean="mapAggregator"/>
       <ref bean="mapCodec"/>