You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ch...@apache.org on 2008/06/18 16:57:40 UTC
svn commit: r669198 - in
/servicemix/components/bindings/servicemix-cxf-bc/trunk: ./
src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
Author: chirino
Date: Wed Jun 18 07:57:39 2008
New Revision: 669198
URL: http://svn.apache.org/viewvc?rev=669198&view=rev
Log:
Merged revisions 668383 via svnmerge from
https://svn.apache.org/repos/asf/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc
........
r668383 | ffang | 2008-06-16 23:11:18 -0400 (Mon, 16 Jun 2008) | 1 line
[SM-1399]several tests failed in servicemix-cxf-bc due to not build wsdl message correctly from the servicemodel
........
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/ (props changed)
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
Propchange: servicemix/components/bindings/servicemix-cxf-bc/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 18 07:57:39 2008
@@ -1 +1 @@
-/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc:1-666757
+/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc:1-669197
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java?rev=669198&r1=669197&r2=669198&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java Wed Jun 18 07:57:39 2008
@@ -72,6 +72,7 @@
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.Conduit;
@@ -377,10 +378,15 @@
.getAttribute("targetNamespace"))) {
sInfo.setElement(ele);
+
}
}
}
serInfo.setProperty(WSDLServiceBuilder.WSDL_DEFINITION, null);
+ serInfo.getInterface().setProperty(WSDLServiceBuilder.WSDL_PORTTYPE, null);
+ for (OperationInfo opInfo : serInfo.getInterface().getOperations()) {
+ opInfo.setProperty(WSDLServiceBuilder.WSDL_OPERATION, null);
+ }
description = WSDLFactory.newInstance().newWSDLWriter()
.getDocument(swBuilder.build());
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java?rev=669198&r1=669197&r2=669198&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java Wed Jun 18 07:57:39 2008
@@ -66,6 +66,8 @@
}
+
+
@Override
protected AbstractXmlApplicationContext createBeanFactory() {
return new ClassPathXmlApplicationContext(