Author: dandiep
Date: Sun Feb 18 13:18:53 2007
New Revision: 509007
URL: http://svn.apache.org/viewvc?view=rev&rev=509007
Log:
Make getConduit public on the Client so that people can easily tweak
settings on their conduit when using the API.
Also, add in a Spring schema for SOAP bindings.
Added:
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd
(with props)
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java?view=diff&rev=509007&r1=509006&r2=509007
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java
(original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java
Sun Feb 18 13:18:53 2007
@@ -25,6 +25,7 @@
import org.apache.cxf.interceptor.InterceptorProvider;
import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
public interface Client extends InterceptorProvider, MessageObserver {
@@ -71,5 +72,10 @@
Map<String, Object> context) throws Exception;
Endpoint getEndpoint();
-
+
+ /**
+ * Get the Conduit that messages for this client will be sent on.
+ * @return
+ */
+ Conduit getConduit();
}
Added:
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd?view=auto&rev=509007
==============================================================================
---
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd
(added)
+++
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd
Sun Feb 18 13:18:53 2007
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:beans="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";
+ targetNamespace="http://cxf.apache.org/bindings/soap";
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified" >
+
+ <xsd:import namespace="http://www.springframework.org/schema/beans"; />
+
+ <xsd:element name="soapBinding">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="beans:identifiedType">
+ <xsd:sequence>
+ <xsd:element name="implementor" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="invoker" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="binding" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="serviceFactory" type="xsd:anyType"
minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="version" type="xsd:string" />
+ <xsd:attribute name="mtomEnabled" type="xsd:string" />
+ <xsd:attribute name="style" type="xsd:string" />
+ <xsd:attribute name="use" type="xsd:string" />
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
+
+</xsd:schema>
Propchange:
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?view=diff&rev=509007&r1=509006&r2=509007
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Sun Feb 18 13:18:53 2007
@@ -291,7 +291,7 @@
}
}
- protected Conduit getConduit() {
+ public Conduit getConduit() {
if (null == initedConduit) {
EndpointInfo ei = endpoint.getEndpointInfo();
String transportID = ei.getTransportId();
Modified:
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java?view=diff&rev=509007&r1=509006&r2=509007
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
(original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
Sun Feb 18 13:18:53 2007
@@ -253,7 +253,7 @@
}
@Override
- protected synchronized Conduit getConduit() {
+ public synchronized Conduit getConduit() {
Conduit c = null;
if (null != Proxy.this.reliableEndpoint.getApplicationReplyTo()) {
