You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2006/08/25 15:17:37 UTC
svn commit: r436785 [12/18] - in /incubator/cxf/trunk: ./ api/
api/src/main/java/org/apache/cxf/buslifecycle/
api/src/main/java/org/apache/cxf/databinding/
api/src/main/java/org/apache/cxf/endpoint/
api/src/main/java/org/apache/cxf/interceptor/ api/src...
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/resources/wsdl/hello_world_rpc_lit.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/resources/wsdl/hello_world_rpc_lit.wsdl?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/resources/wsdl/hello_world_rpc_lit.wsdl (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/resources/wsdl/hello_world_rpc_lit.wsdl Fri Aug 25 06:16:36 2006
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_rpclit"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_rpclit"
- xmlns:x1="http://apache.org/hello_world_rpclit/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_rpclit/types"
- xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
- <complexType name="myComplexStruct">
- <sequence>
- <element name="elem1" type="xsd:string"/>
- <element name="elem2" type="xsd:string"/>
- <element name="elem3" type="xsd:int"/>
- </sequence>
- </complexType>
- </schema>
- </wsdl:types>
-
- <wsdl:message name="sayHiRequest"/>
-
- <wsdl:message name="sayHiResponse">
- <wsdl:part type="xsd:string" name="out"/>
- </wsdl:message>
-
- <wsdl:message name="greetMeRequest">
- <wsdl:part type="xsd:string" name="in"/>
- </wsdl:message>
-
- <wsdl:message name="greetMeResponse">
- <wsdl:part type="xsd:string" name="out"/>
- </wsdl:message>
-
- <wsdl:message name="sendReceiveDataRequest">
- <wsdl:part type="x1:myComplexStruct" name="in"/>
- </wsdl:message>
-
- <wsdl:message name="sendReceiveDataResponse">
- <wsdl:part type="x1:myComplexStruct" name="out"/>
- </wsdl:message>
-
- <wsdl:portType name="GreeterRPCLit">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
- <wsdl:operation name="sendReceiveData">
- <wsdl:input message="tns:sendReceiveDataRequest" name="SendReceiveDataRequest"/>
- <wsdl:output message="tns:sendReceiveDataResponse" name="SendReceiveDataResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="Greeter_SOAPBinding_RPCLit" type="tns:GreeterRPCLit">
-
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="sayHi">
- <soap:operation soapAction="" style="rpc"/>
- <wsdl:input>
- <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="rpc"/>
- <wsdl:input>
- <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="sendReceiveData">
- <soap:operation soapAction="" style="rpc"/>
- <wsdl:input>
- <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="SOAPServiceRPCLit">
- <wsdl:port binding="tns:Greeter_SOAPBinding_RPCLit" name="SoapPortRPCLit">
- <soap:address location="http://localhost:9002/SOAPServiceRPCLit/SoapPort"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_rpclit"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://apache.org/hello_world_rpclit"
+ xmlns:x1="http://apache.org/hello_world_rpclit/types"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <wsdl:types>
+ <schema targetNamespace="http://apache.org/hello_world_rpclit/types"
+ xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ <complexType name="myComplexStruct">
+ <sequence>
+ <element name="elem1" type="xsd:string"/>
+ <element name="elem2" type="xsd:string"/>
+ <element name="elem3" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="sayHiRequest"/>
+
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part type="xsd:string" name="out"/>
+ </wsdl:message>
+
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part type="xsd:string" name="in"/>
+ </wsdl:message>
+
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part type="xsd:string" name="out"/>
+ </wsdl:message>
+
+ <wsdl:message name="sendReceiveDataRequest">
+ <wsdl:part type="x1:myComplexStruct" name="in"/>
+ </wsdl:message>
+
+ <wsdl:message name="sendReceiveDataResponse">
+ <wsdl:part type="x1:myComplexStruct" name="out"/>
+ </wsdl:message>
+
+ <wsdl:portType name="GreeterRPCLit">
+ <wsdl:operation name="sayHi">
+ <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+ <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="greetMe">
+ <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+ <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="sendReceiveData">
+ <wsdl:input message="tns:sendReceiveDataRequest" name="SendReceiveDataRequest"/>
+ <wsdl:output message="tns:sendReceiveDataResponse" name="SendReceiveDataResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="Greeter_SOAPBinding_RPCLit" type="tns:GreeterRPCLit">
+
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="sayHi">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="sendReceiveData">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="SOAPServiceRPCLit">
+ <wsdl:port binding="tns:Greeter_SOAPBinding_RPCLit" name="SoapPortRPCLit">
+ <soap:address location="http://localhost:9002/SOAPServiceRPCLit/SoapPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Propchange: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/resources/wsdl/hello_world_rpc_lit.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/resources/wsdl/hello_world_rpc_lit.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/resources/wsdl/hello_world_rpc_lit.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: incubator/cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/attachments/primarySoapPart.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java Fri Aug 25 06:16:36 2006
@@ -1,108 +1,108 @@
-package org.apache.cxf.binding;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.service.model.AbstractPropertiesHolder;
-import org.apache.cxf.service.model.BindingInfo;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.wsdl11.WSDLBindingFactory;
-
-import static org.apache.cxf.helpers.CastUtils.cast;
-
-public abstract class AbstractBindingFactory implements BindingFactory, WSDLBindingFactory {
-
- @Resource
- Bus bus;
-
- @Resource
- Collection<String> activationNamespaces;
-
- @PostConstruct
- void registerWithBindingManager() {
- BindingFactoryManager manager = bus.getExtension(BindingFactoryManager.class);
- for (String ns : activationNamespaces) {
- manager.registerBindingFactory(ns, this);
- }
- }
-
- /**
- * Creates a "default" BindingInfo object for the service. Called by
- * createBindingInfo(ServiceInfo service, Binding binding) to actually
- * create the BindingInfo. Can return a subclass which can then process
- * the extensors within the subclass.
- * @param service
- * @return
- */
- public BindingInfo createBindingInfo(ServiceInfo service, String namespace) {
- return new BindingInfo(service, namespace);
- }
-
-
- /**
- * Copies extensors from the Binding to BindingInfo.
- * @param service
- * @param binding
- * @return
- */
- public BindingInfo createBindingInfo(ServiceInfo service, Binding binding) {
-
- String namespace = ((ExtensibilityElement)binding.getExtensibilityElements().get(0))
- .getElementType().getNamespaceURI();
- BindingInfo bi = createBindingInfo(service, namespace);
-
- return initializeBindingInfo(service, binding, bi);
- }
-
- protected BindingInfo initializeBindingInfo(ServiceInfo service, Binding binding, BindingInfo bi) {
- bi.setName(binding.getQName());
- copyExtensors(bi, binding.getExtensibilityElements());
-
- for (BindingOperation bop : cast(binding.getBindingOperations(), BindingOperation.class)) {
- String inName = null;
- String outName = null;
- if (bop.getBindingInput() != null) {
- inName = bop.getBindingInput().getName();
- }
- if (bop.getBindingOutput() != null) {
- outName = bop.getBindingOutput().getName();
- }
- BindingOperationInfo bop2 = bi.buildOperation(new QName(service.getName().getNamespaceURI(),
- bop.getName()), inName, outName);
- if (bop2 != null) {
-
- copyExtensors(bop2, bop.getExtensibilityElements());
- bi.addOperation(bop2);
- if (bop.getBindingInput() != null) {
- copyExtensors(bop2.getInput(), bop.getBindingInput().getExtensibilityElements());
- }
- if (bop.getBindingOutput() != null) {
- copyExtensors(bop2.getOutput(), bop.getBindingOutput().getExtensibilityElements());
- }
- for (BindingFault f : cast(bop.getBindingFaults().values(), BindingFault.class)) {
- copyExtensors(bop2.getFault(f.getName()), bop.getBindingFault(f.getName())
- .getExtensibilityElements());
- }
- }
- }
- return bi;
- }
-
- private void copyExtensors(AbstractPropertiesHolder info, List<?> extList) {
- if (info != null) {
- for (ExtensibilityElement ext : cast(extList, ExtensibilityElement.class)) {
- info.addExtensor(ext);
- }
- }
- }
-}
+package org.apache.cxf.binding;
+
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.wsdl.Binding;
+import javax.wsdl.BindingFault;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.service.model.AbstractPropertiesHolder;
+import org.apache.cxf.service.model.BindingInfo;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl11.WSDLBindingFactory;
+
+import static org.apache.cxf.helpers.CastUtils.cast;
+
+public abstract class AbstractBindingFactory implements BindingFactory, WSDLBindingFactory {
+
+ @Resource
+ Bus bus;
+
+ @Resource
+ Collection<String> activationNamespaces;
+
+ @PostConstruct
+ void registerWithBindingManager() {
+ BindingFactoryManager manager = bus.getExtension(BindingFactoryManager.class);
+ for (String ns : activationNamespaces) {
+ manager.registerBindingFactory(ns, this);
+ }
+ }
+
+ /**
+ * Creates a "default" BindingInfo object for the service. Called by
+ * createBindingInfo(ServiceInfo service, Binding binding) to actually
+ * create the BindingInfo. Can return a subclass which can then process
+ * the extensors within the subclass.
+ * @param service
+ * @return
+ */
+ public BindingInfo createBindingInfo(ServiceInfo service, String namespace) {
+ return new BindingInfo(service, namespace);
+ }
+
+
+ /**
+ * Copies extensors from the Binding to BindingInfo.
+ * @param service
+ * @param binding
+ * @return
+ */
+ public BindingInfo createBindingInfo(ServiceInfo service, Binding binding) {
+
+ String namespace = ((ExtensibilityElement)binding.getExtensibilityElements().get(0))
+ .getElementType().getNamespaceURI();
+ BindingInfo bi = createBindingInfo(service, namespace);
+
+ return initializeBindingInfo(service, binding, bi);
+ }
+
+ protected BindingInfo initializeBindingInfo(ServiceInfo service, Binding binding, BindingInfo bi) {
+ bi.setName(binding.getQName());
+ copyExtensors(bi, binding.getExtensibilityElements());
+
+ for (BindingOperation bop : cast(binding.getBindingOperations(), BindingOperation.class)) {
+ String inName = null;
+ String outName = null;
+ if (bop.getBindingInput() != null) {
+ inName = bop.getBindingInput().getName();
+ }
+ if (bop.getBindingOutput() != null) {
+ outName = bop.getBindingOutput().getName();
+ }
+ BindingOperationInfo bop2 = bi.buildOperation(new QName(service.getName().getNamespaceURI(),
+ bop.getName()), inName, outName);
+ if (bop2 != null) {
+
+ copyExtensors(bop2, bop.getExtensibilityElements());
+ bi.addOperation(bop2);
+ if (bop.getBindingInput() != null) {
+ copyExtensors(bop2.getInput(), bop.getBindingInput().getExtensibilityElements());
+ }
+ if (bop.getBindingOutput() != null) {
+ copyExtensors(bop2.getOutput(), bop.getBindingOutput().getExtensibilityElements());
+ }
+ for (BindingFault f : cast(bop.getBindingFaults().values(), BindingFault.class)) {
+ copyExtensors(bop2.getFault(f.getName()), bop.getBindingFault(f.getName())
+ .getExtensibilityElements());
+ }
+ }
+ }
+ return bi;
+ }
+
+ private void copyExtensors(AbstractPropertiesHolder info, List<?> extList) {
+ if (info != null) {
+ for (ExtensibilityElement ext : cast(extList, ExtensibilityElement.class)) {
+ info.addExtensor(ext);
+ }
+ }
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/AttachmentDataSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/AttachmentDataSource.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/AttachmentImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/AttachmentImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/AttachmentUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/AttachmentUtil.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/ByteDataSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/ByteDataSource.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/CachedOutputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/CachedOutputStream.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,121 +1,121 @@
-package org.apache.cxf.interceptor;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.databinding.DataReader;
-import org.apache.cxf.databinding.DataReaderFactory;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.service.Service;
-import org.apache.cxf.service.model.OperationInfo;
-import org.apache.cxf.service.model.ServiceModelUtil;
-import org.apache.cxf.staxutils.DepthXMLStreamReader;
-
-public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInterceptor<Message> {
- private static final ResourceBundle BUNDLE = BundleUtils
- .getBundle(AbstractInDatabindingInterceptor.class);
-
- protected boolean isRequestor(Message message) {
- return Boolean.TRUE.equals(message.containsKey(Message.REQUESTOR_ROLE));
- }
-
- protected DataReader<XMLStreamReader> getDataReader(Message message) {
- Service service = ServiceModelUtil.getService(message.getExchange());
- DataReaderFactory factory = service.getDataReaderFactory();
-
- DataReader<XMLStreamReader> dataReader = null;
- for (Class<?> cls : factory.getSupportedFormats()) {
- if (cls == XMLStreamReader.class) {
- dataReader = factory.createReader(XMLStreamReader.class);
- break;
- }
- }
- if (dataReader == null) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("NO_DATAREADER", BUNDLE,
- service.getName()));
- }
- return dataReader;
- }
-
- protected DepthXMLStreamReader getXMLStreamReader(Message message) {
- XMLStreamReader xr = message.getContent(XMLStreamReader.class);
- return new DepthXMLStreamReader(xr);
- }
-
- protected OperationInfo findOperation(Collection<OperationInfo> operations, List<Object> parameters) {
- // first check for exact matches
- for (OperationInfo o : operations) {
- List messageParts = o.getInput().getMessageParts();
- if (messageParts.size() == parameters.size()) {
- return o;
-// if (checkExactParameters(messageParts, parameters))
-// return o;
- }
- }
-
-// // now check for assignable matches
-// for (OperationInfo o : operations) {
-// List messageParts = o.getInput().getMessageParts();
-// if (messageParts.size() == parameters.size()) {
-// if (checkParameters(messageParts, parameters))
-// return o;
-// }
-// }
- return null;
- }
-//
-// /**
-// * Return true only if the message parts exactly match the classes of the
-// * parameters
-// *
-// * @param messageParts
-// * @param parameters
-// * @return
-// */
-// private boolean checkExactParameters(List messageParts, List parameters) {
-// Iterator messagePartIterator = messageParts.iterator();
-// for (Iterator parameterIterator = parameters.iterator(); parameterIterator.hasNext();) {
-// Object param = parameterIterator.next();
-// MessagePartInfo mpi = (MessagePartInfo)messagePartIterator.next();
-// if (!mpi.getTypeClass().equals(param.getClass())) {
-// return false;
-// }
-// }
-// return true;
-// }
-//
-// private boolean checkParameters(List messageParts, List parameters) {
-// Iterator messagePartIterator = messageParts.iterator();
-// for (Iterator parameterIterator = parameters.iterator(); parameterIterator.hasNext();) {
-// Object param = parameterIterator.next();
-// MessagePartInfo mpi = (MessagePartInfo)messagePartIterator.next();
-//
-// if (!mpi.getTypeClass().isAssignableFrom(param.getClass())) {
-// if (!param.getClass().isPrimitive() && mpi.getTypeClass().isPrimitive()) {
-// return checkPrimitiveMatch(mpi.getTypeClass(), param.getClass());
-// } else {
-// return false;
-// }
-// }
-// }
-// return true;
-// }
-//
-// private boolean checkPrimitiveMatch(Class clazz, Class typeClass) {
-// if ((typeClass == Integer.class && clazz == int.class)
-// || (typeClass == Double.class && clazz == double.class)
-// || (typeClass == Long.class && clazz == long.class)
-// || (typeClass == Float.class && clazz == float.class)
-// || (typeClass == Short.class && clazz == short.class)
-// || (typeClass == Boolean.class && clazz == boolean.class)
-// || (typeClass == Byte.class && clazz == byte.class))
-// return true;
-//
-// return false;
-// }
-}
+package org.apache.cxf.interceptor;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.ResourceBundle;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.databinding.DataReader;
+import org.apache.cxf.databinding.DataReaderFactory;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.service.Service;
+import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.service.model.ServiceModelUtil;
+import org.apache.cxf.staxutils.DepthXMLStreamReader;
+
+public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInterceptor<Message> {
+ private static final ResourceBundle BUNDLE = BundleUtils
+ .getBundle(AbstractInDatabindingInterceptor.class);
+
+ protected boolean isRequestor(Message message) {
+ return Boolean.TRUE.equals(message.containsKey(Message.REQUESTOR_ROLE));
+ }
+
+ protected DataReader<XMLStreamReader> getDataReader(Message message) {
+ Service service = ServiceModelUtil.getService(message.getExchange());
+ DataReaderFactory factory = service.getDataReaderFactory();
+
+ DataReader<XMLStreamReader> dataReader = null;
+ for (Class<?> cls : factory.getSupportedFormats()) {
+ if (cls == XMLStreamReader.class) {
+ dataReader = factory.createReader(XMLStreamReader.class);
+ break;
+ }
+ }
+ if (dataReader == null) {
+ throw new Fault(new org.apache.cxf.common.i18n.Message("NO_DATAREADER", BUNDLE,
+ service.getName()));
+ }
+ return dataReader;
+ }
+
+ protected DepthXMLStreamReader getXMLStreamReader(Message message) {
+ XMLStreamReader xr = message.getContent(XMLStreamReader.class);
+ return new DepthXMLStreamReader(xr);
+ }
+
+ protected OperationInfo findOperation(Collection<OperationInfo> operations, List<Object> parameters) {
+ // first check for exact matches
+ for (OperationInfo o : operations) {
+ List messageParts = o.getInput().getMessageParts();
+ if (messageParts.size() == parameters.size()) {
+ return o;
+// if (checkExactParameters(messageParts, parameters))
+// return o;
+ }
+ }
+
+// // now check for assignable matches
+// for (OperationInfo o : operations) {
+// List messageParts = o.getInput().getMessageParts();
+// if (messageParts.size() == parameters.size()) {
+// if (checkParameters(messageParts, parameters))
+// return o;
+// }
+// }
+ return null;
+ }
+//
+// /**
+// * Return true only if the message parts exactly match the classes of the
+// * parameters
+// *
+// * @param messageParts
+// * @param parameters
+// * @return
+// */
+// private boolean checkExactParameters(List messageParts, List parameters) {
+// Iterator messagePartIterator = messageParts.iterator();
+// for (Iterator parameterIterator = parameters.iterator(); parameterIterator.hasNext();) {
+// Object param = parameterIterator.next();
+// MessagePartInfo mpi = (MessagePartInfo)messagePartIterator.next();
+// if (!mpi.getTypeClass().equals(param.getClass())) {
+// return false;
+// }
+// }
+// return true;
+// }
+//
+// private boolean checkParameters(List messageParts, List parameters) {
+// Iterator messagePartIterator = messageParts.iterator();
+// for (Iterator parameterIterator = parameters.iterator(); parameterIterator.hasNext();) {
+// Object param = parameterIterator.next();
+// MessagePartInfo mpi = (MessagePartInfo)messagePartIterator.next();
+//
+// if (!mpi.getTypeClass().isAssignableFrom(param.getClass())) {
+// if (!param.getClass().isPrimitive() && mpi.getTypeClass().isPrimitive()) {
+// return checkPrimitiveMatch(mpi.getTypeClass(), param.getClass());
+// } else {
+// return false;
+// }
+// }
+// }
+// return true;
+// }
+//
+// private boolean checkPrimitiveMatch(Class clazz, Class typeClass) {
+// if ((typeClass == Integer.class && clazz == int.class)
+// || (typeClass == Double.class && clazz == double.class)
+// || (typeClass == Long.class && clazz == long.class)
+// || (typeClass == Float.class && clazz == float.class)
+// || (typeClass == Short.class && clazz == short.class)
+// || (typeClass == Boolean.class && clazz == boolean.class)
+// || (typeClass == Byte.class && clazz == byte.class))
+// return true;
+//
+// return false;
+// }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,46 +1,46 @@
-package org.apache.cxf.interceptor;
-
-import java.util.ResourceBundle;
-
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.databinding.DataWriterFactory;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.service.Service;
-import org.apache.cxf.service.model.ServiceModelUtil;
-
-public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInterceptor<Message> {
- private static final ResourceBundle BUNDLE = BundleUtils
- .getBundle(AbstractOutDatabindingInterceptor.class);
-
- protected boolean isRequestor(Message message) {
- return Boolean.TRUE.equals(message.containsKey(Message.REQUESTOR_ROLE));
- }
-
- protected DataWriter<XMLStreamWriter> getDataWriter(Message message) {
- Service service = ServiceModelUtil.getService(message.getExchange());
- DataWriterFactory factory = service.getDataWriterFactory();
-
- DataWriter<XMLStreamWriter> dataWriter = null;
- for (Class<?> cls : factory.getSupportedFormats()) {
- if (cls == XMLStreamWriter.class) {
- dataWriter = factory.createWriter(XMLStreamWriter.class);
- break;
- }
- }
-
- if (dataWriter == null) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("NO_DATAWRITER", BUNDLE, service
- .getName()));
- }
-
- return dataWriter;
- }
-
- protected XMLStreamWriter getXMLStreamWriter(Message message) {
- return message.getContent(XMLStreamWriter.class);
- }
-}
+package org.apache.cxf.interceptor;
+
+import java.util.ResourceBundle;
+
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.databinding.DataWriter;
+import org.apache.cxf.databinding.DataWriterFactory;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.service.Service;
+import org.apache.cxf.service.model.ServiceModelUtil;
+
+public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInterceptor<Message> {
+ private static final ResourceBundle BUNDLE = BundleUtils
+ .getBundle(AbstractOutDatabindingInterceptor.class);
+
+ protected boolean isRequestor(Message message) {
+ return Boolean.TRUE.equals(message.containsKey(Message.REQUESTOR_ROLE));
+ }
+
+ protected DataWriter<XMLStreamWriter> getDataWriter(Message message) {
+ Service service = ServiceModelUtil.getService(message.getExchange());
+ DataWriterFactory factory = service.getDataWriterFactory();
+
+ DataWriter<XMLStreamWriter> dataWriter = null;
+ for (Class<?> cls : factory.getSupportedFormats()) {
+ if (cls == XMLStreamWriter.class) {
+ dataWriter = factory.createWriter(XMLStreamWriter.class);
+ break;
+ }
+ }
+
+ if (dataWriter == null) {
+ throw new Fault(new org.apache.cxf.common.i18n.Message("NO_DATAWRITER", BUNDLE, service
+ .getName()));
+ }
+
+ return dataWriter;
+ }
+
+ protected XMLStreamWriter getXMLStreamWriter(Message message) {
+ return message.getContent(XMLStreamWriter.class);
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,59 +1,59 @@
-package org.apache.cxf.interceptor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.cxf.databinding.DataReader;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.Service;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.OperationInfo;
-import org.apache.cxf.staxutils.DepthXMLStreamReader;
-import org.apache.cxf.staxutils.StaxUtils;
-
-public class BareInInterceptor extends AbstractInDatabindingInterceptor {
-
- public BareInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
- }
-
- public void handleMessage(Message message) {
- DepthXMLStreamReader xmlReader = getXMLStreamReader(message);
- Exchange exchange = message.getExchange();
-
- BindingOperationInfo operation = exchange.get(BindingOperationInfo.class);
-
- DataReader<XMLStreamReader> dr = getDataReader(message);
- List<Object> parameters = new ArrayList<Object>();
-
- StaxUtils.nextEvent(xmlReader);
- while (StaxUtils.toNextElement(xmlReader)) {
- parameters.add(dr.read(xmlReader));
- }
-
- // If we didn't know the operation going into this, lets try to figure
- // it out
- if (operation == null) {
- Endpoint ep = exchange.get(Endpoint.class);
- Service service = ep.getService();
-
- OperationInfo op = findOperation(service.getServiceInfo().getInterface().getOperations(),
- parameters);
-
- for (BindingOperationInfo bop : ep.getEndpointInfo().getBinding().getOperations()) {
- if (bop.getOperationInfo().equals(op)) {
- exchange.put(BindingOperationInfo.class, bop);
- break;
- }
- }
- }
-
- message.setContent(List.class, parameters);
- }
-}
+package org.apache.cxf.interceptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.databinding.DataReader;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.Service;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.staxutils.DepthXMLStreamReader;
+import org.apache.cxf.staxutils.StaxUtils;
+
+public class BareInInterceptor extends AbstractInDatabindingInterceptor {
+
+ public BareInInterceptor() {
+ super();
+ setPhase(Phase.UNMARSHAL);
+ }
+
+ public void handleMessage(Message message) {
+ DepthXMLStreamReader xmlReader = getXMLStreamReader(message);
+ Exchange exchange = message.getExchange();
+
+ BindingOperationInfo operation = exchange.get(BindingOperationInfo.class);
+
+ DataReader<XMLStreamReader> dr = getDataReader(message);
+ List<Object> parameters = new ArrayList<Object>();
+
+ StaxUtils.nextEvent(xmlReader);
+ while (StaxUtils.toNextElement(xmlReader)) {
+ parameters.add(dr.read(xmlReader));
+ }
+
+ // If we didn't know the operation going into this, lets try to figure
+ // it out
+ if (operation == null) {
+ Endpoint ep = exchange.get(Endpoint.class);
+ Service service = ep.getService();
+
+ OperationInfo op = findOperation(service.getServiceInfo().getInterface().getOperations(),
+ parameters);
+
+ for (BindingOperationInfo bop : ep.getEndpointInfo().getBinding().getOperations()) {
+ if (bop.getOperationInfo().equals(op)) {
+ exchange.put(BindingOperationInfo.class, bop);
+ break;
+ }
+ }
+ }
+
+ message.setContent(List.class, parameters);
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,58 +1,58 @@
-package org.apache.cxf.interceptor;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.MessagePartInfo;
-import org.apache.cxf.service.model.ServiceModelUtil;
-
-public class BareOutInterceptor extends AbstractOutDatabindingInterceptor {
-
- public BareOutInterceptor() {
- super();
- setPhase(Phase.MARSHAL);
- }
-
- public void handleMessage(Message message) {
- XMLStreamWriter xmlWriter = getXMLStreamWriter(message);
-
- Exchange exchange = message.getExchange();
- BindingOperationInfo operation = (BindingOperationInfo)exchange.get(BindingOperationInfo.class
- .getName());
- DataWriter<XMLStreamWriter> dataWriter = getDataWriter(message);
-
- int countParts = 0;
- List<MessagePartInfo> parts = null;
- if (!isRequestor(message)) {
- parts = operation.getOutput().getMessageInfo().getMessageParts();
- } else {
- parts = operation.getInput().getMessageInfo().getMessageParts();
- }
- countParts = parts.size();
-
- if (countParts > 0) {
- List<?> objs = message.getContent(List.class);
- Object[] args = objs.toArray();
- Object[] els = parts.toArray();
-
- if (args.length != els.length) {
- message.setContent(Exception.class,
- new RuntimeException("The number of arguments is not equal!"));
- }
-
- for (int idx = 0; idx < countParts; idx++) {
- Object arg = args[idx];
- MessagePartInfo part = (MessagePartInfo)els[idx];
- QName elName = ServiceModelUtil.getPartName(part);
- dataWriter.write(arg, elName, xmlWriter);
- }
- }
- }
-}
+package org.apache.cxf.interceptor;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.cxf.databinding.DataWriter;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.MessagePartInfo;
+import org.apache.cxf.service.model.ServiceModelUtil;
+
+public class BareOutInterceptor extends AbstractOutDatabindingInterceptor {
+
+ public BareOutInterceptor() {
+ super();
+ setPhase(Phase.MARSHAL);
+ }
+
+ public void handleMessage(Message message) {
+ XMLStreamWriter xmlWriter = getXMLStreamWriter(message);
+
+ Exchange exchange = message.getExchange();
+ BindingOperationInfo operation = (BindingOperationInfo)exchange.get(BindingOperationInfo.class
+ .getName());
+ DataWriter<XMLStreamWriter> dataWriter = getDataWriter(message);
+
+ int countParts = 0;
+ List<MessagePartInfo> parts = null;
+ if (!isRequestor(message)) {
+ parts = operation.getOutput().getMessageInfo().getMessageParts();
+ } else {
+ parts = operation.getInput().getMessageInfo().getMessageParts();
+ }
+ countParts = parts.size();
+
+ if (countParts > 0) {
+ List<?> objs = message.getContent(List.class);
+ Object[] args = objs.toArray();
+ Object[] els = parts.toArray();
+
+ if (args.length != els.length) {
+ message.setContent(Exception.class,
+ new RuntimeException("The number of arguments is not equal!"));
+ }
+
+ for (int idx = 0; idx < countParts; idx++) {
+ Object arg = args[idx];
+ MessagePartInfo part = (MessagePartInfo)els[idx];
+ QName elName = ServiceModelUtil.getPartName(part);
+ dataWriter.write(arg, elName, xmlWriter);
+ }
+ }
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties Fri Aug 25 06:16:36 2006
@@ -1,7 +1,7 @@
-STREAM_CREATE_EXC = Could not create XMLStreamReader.
-STAX_READ_EXC = Could read from XMLStreamReader.
-NO_OPERATION_ELEMENT=There must be an operation element.
-NO_OPERATION=No such operation: {0}
-NO_DATAREADER=No DataReader is available for Service: {0}
-NO_DATAWRITER=No DataWriter is available for Service: {0}
+STREAM_CREATE_EXC = Could not create XMLStreamReader.
+STAX_READ_EXC = Could read from XMLStreamReader.
+NO_OPERATION_ELEMENT=There must be an operation element.
+NO_OPERATION=No such operation: {0}
+NO_DATAREADER=No DataReader is available for Service: {0}
+NO_DATAWRITER=No DataWriter is available for Service: {0}
COULD_NOT_UNRWAP=Could not unrwap message parts.
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,27 +1,27 @@
-package org.apache.cxf.interceptor;
-
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.BindingMessageInfo;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.MessageInfo;
-
-public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message> {
-
- public OutgoingChainInterceptor() {
- super();
- setPhase(Phase.POST_INVOKE);
- }
-
- public void handleMessage(Message message) {
- Exchange ex = message.getExchange();
- Message out = ex.getOutMessage();
-
- BindingOperationInfo bin = ex.get(BindingOperationInfo.class);
- out.put(MessageInfo.class, bin.getOperationInfo().getOutput());
- out.put(BindingMessageInfo.class, bin.getOutput());
- out.getInterceptorChain().doIntercept(out);
- }
-}
+package org.apache.cxf.interceptor;
+
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.model.BindingMessageInfo;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.MessageInfo;
+
+public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message> {
+
+ public OutgoingChainInterceptor() {
+ super();
+ setPhase(Phase.POST_INVOKE);
+ }
+
+ public void handleMessage(Message message) {
+ Exchange ex = message.getExchange();
+ Message out = ex.getOutMessage();
+
+ BindingOperationInfo bin = ex.get(BindingOperationInfo.class);
+ out.put(MessageInfo.class, bin.getOperationInfo().getOutput());
+ out.put(BindingMessageInfo.class, bin.getOutput());
+ out.getInterceptorChain().doIntercept(out);
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,69 +1,69 @@
-package org.apache.cxf.interceptor;
-
-import java.io.IOException;
-
-import javax.wsdl.WSDLException;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.phase.PhaseInterceptorChain;
-import org.apache.cxf.phase.PhaseManager;
-import org.apache.cxf.service.model.BindingOperationInfo;
-
-/**
- * Sets up the outgoing chain if the operation has an output message.
- * @author Dan Diephouse
- */
-public class OutgoingChainSetupInterceptor extends AbstractPhaseInterceptor<Message> {
-
- public OutgoingChainSetupInterceptor() {
- super();
- setPhase(Phase.PRE_LOGICAL);
- }
-
- public void handleMessage(Message message) {
- Exchange ex = message.getExchange();
- BindingOperationInfo bop = ex.get(BindingOperationInfo.class);
-
- if (bop.getOperationInfo().isOneWay()) {
- return;
- }
-
- Bus bus = ex.get(Bus.class);
- PhaseManager pm = bus.getExtension(PhaseManager.class);
- PhaseInterceptorChain chain = new PhaseInterceptorChain(pm.getOutPhases());
-
- Endpoint ep = ex.get(Endpoint.class);
- chain.add(ep.getOutInterceptors());
- chain.add(ep.getService().getOutInterceptors());
- chain.add(bus.getOutInterceptors());
- if (ep.getBinding() != null) {
- chain.add(ep.getBinding().getOutInterceptors());
- }
-
- Message outMessage = message.getExchange().getOutMessage();
- if (outMessage == null) {
- outMessage = ep.getBinding().createMessage();
- ex.setOutMessage(outMessage);
- }
-
- if (outMessage.getConduit() == null
- && ex.getConduit() == null
- && ex.getDestination() != null) {
- try {
- ex.setConduit(ex.getDestination().getBackChannel(message, null, null));
- } catch (WSDLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- outMessage.setInterceptorChain(chain);
- }
-}
+package org.apache.cxf.interceptor;
+
+import java.io.IOException;
+
+import javax.wsdl.WSDLException;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.phase.PhaseManager;
+import org.apache.cxf.service.model.BindingOperationInfo;
+
+/**
+ * Sets up the outgoing chain if the operation has an output message.
+ * @author Dan Diephouse
+ */
+public class OutgoingChainSetupInterceptor extends AbstractPhaseInterceptor<Message> {
+
+ public OutgoingChainSetupInterceptor() {
+ super();
+ setPhase(Phase.PRE_LOGICAL);
+ }
+
+ public void handleMessage(Message message) {
+ Exchange ex = message.getExchange();
+ BindingOperationInfo bop = ex.get(BindingOperationInfo.class);
+
+ if (bop.getOperationInfo().isOneWay()) {
+ return;
+ }
+
+ Bus bus = ex.get(Bus.class);
+ PhaseManager pm = bus.getExtension(PhaseManager.class);
+ PhaseInterceptorChain chain = new PhaseInterceptorChain(pm.getOutPhases());
+
+ Endpoint ep = ex.get(Endpoint.class);
+ chain.add(ep.getOutInterceptors());
+ chain.add(ep.getService().getOutInterceptors());
+ chain.add(bus.getOutInterceptors());
+ if (ep.getBinding() != null) {
+ chain.add(ep.getBinding().getOutInterceptors());
+ }
+
+ Message outMessage = message.getExchange().getOutMessage();
+ if (outMessage == null) {
+ outMessage = ep.getBinding().createMessage();
+ ex.setOutMessage(outMessage);
+ }
+
+ if (outMessage.getConduit() == null
+ && ex.getConduit() == null
+ && ex.getDestination() != null) {
+ try {
+ ex.setConduit(ex.getDestination().getBackChannel(message, null, null));
+ } catch (WSDLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ outMessage.setInterceptorChain(chain);
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,66 +1,66 @@
-package org.apache.cxf.interceptor;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.Executor;
-
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.Service;
-import org.apache.cxf.service.invoker.Invoker;
-
-/**
- * Invokes a Binding's invoker with the <code>INVOCATION_INPUT</code> from
- * the Exchange.
- * @author Dan Diephouse
- */
-public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message> {
-
-
- public ServiceInvokerInterceptor() {
- super();
- setPhase(Phase.INVOKE);
- }
-
- public void handleMessage(final Message message) {
- final Exchange exchange = message.getExchange();
- final Endpoint endpoint = exchange.get(Endpoint.class);
- final Service service = endpoint.getService();
- final Invoker invoker = service.getInvoker();
-
- getExecutor(endpoint).execute(new Runnable() {
-
- public void run() {
- Object result = invoker.invoke(message.getExchange(),
- exchange.getInMessage().getContent(List.class));
-
- if (result != null) {
- if (!(result instanceof List)) {
- if (result.getClass().isArray()) {
- result = Arrays.asList((Object[])result);
- } else {
- List<Object> o = new ArrayList<Object>();
- o.add(result);
- result = o;
- }
- }
- exchange.getOutMessage().setContent(List.class, result);
- }
- }
-
- });
- }
-
- /**
- * Get the Executor for this invocation.
- * @param endpoint
- * @return
- */
- private Executor getExecutor(final Endpoint endpoint) {
- return endpoint.getService().getExecutor();
- }
-}
+package org.apache.cxf.interceptor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.Service;
+import org.apache.cxf.service.invoker.Invoker;
+
+/**
+ * Invokes a Binding's invoker with the <code>INVOCATION_INPUT</code> from
+ * the Exchange.
+ * @author Dan Diephouse
+ */
+public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message> {
+
+
+ public ServiceInvokerInterceptor() {
+ super();
+ setPhase(Phase.INVOKE);
+ }
+
+ public void handleMessage(final Message message) {
+ final Exchange exchange = message.getExchange();
+ final Endpoint endpoint = exchange.get(Endpoint.class);
+ final Service service = endpoint.getService();
+ final Invoker invoker = service.getInvoker();
+
+ getExecutor(endpoint).execute(new Runnable() {
+
+ public void run() {
+ Object result = invoker.invoke(message.getExchange(),
+ exchange.getInMessage().getContent(List.class));
+
+ if (result != null) {
+ if (!(result instanceof List)) {
+ if (result.getClass().isArray()) {
+ result = Arrays.asList((Object[])result);
+ } else {
+ List<Object> o = new ArrayList<Object>();
+ o.add(result);
+ result = o;
+ }
+ }
+ exchange.getOutMessage().setContent(List.class, result);
+ }
+ }
+
+ });
+ }
+
+ /**
+ * Get the Executor for this invocation.
+ * @param endpoint
+ * @return
+ */
+ private Executor getExecutor(final Endpoint endpoint) {
+ return endpoint.getService().getExecutor();
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,51 +1,51 @@
-package org.apache.cxf.interceptor;
-
-import java.io.InputStream;
-import java.util.ResourceBundle;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-
-/**
- * Creates an XMLStreamReader from the InputStream on the Message.
- */
-public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
- private static final ResourceBundle BUNDLE = BundleUtils.getBundle(StaxInInterceptor.class);
- private XMLInputFactory xif;
-
- public StaxInInterceptor() {
- super();
- setPhase(Phase.POST_STREAM);
- }
-
- public void handleMessage(Message message) {
- InputStream is = message.getContent(InputStream.class);
-
- assert is != null;
-
- // TODO: where does encoding constant go?
- String encoding = (String)message.get("Encoding");
- XMLStreamReader reader;
- try {
- reader = getXMLInputFactory().createXMLStreamReader(is, encoding);
- } catch (XMLStreamException e) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("STREAM_CREATE_EXC", BUNDLE), e);
- }
-
- message.setContent(XMLStreamReader.class, reader);
- }
-
- protected XMLInputFactory getXMLInputFactory() {
- if (xif == null) {
- return XMLInputFactory.newInstance();
- }
-
- return xif;
- }
-}
+package org.apache.cxf.interceptor;
+
+import java.io.InputStream;
+import java.util.ResourceBundle;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+
+/**
+ * Creates an XMLStreamReader from the InputStream on the Message.
+ */
+public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
+ private static final ResourceBundle BUNDLE = BundleUtils.getBundle(StaxInInterceptor.class);
+ private XMLInputFactory xif;
+
+ public StaxInInterceptor() {
+ super();
+ setPhase(Phase.POST_STREAM);
+ }
+
+ public void handleMessage(Message message) {
+ InputStream is = message.getContent(InputStream.class);
+
+ assert is != null;
+
+ // TODO: where does encoding constant go?
+ String encoding = (String)message.get("Encoding");
+ XMLStreamReader reader;
+ try {
+ reader = getXMLInputFactory().createXMLStreamReader(is, encoding);
+ } catch (XMLStreamException e) {
+ throw new Fault(new org.apache.cxf.common.i18n.Message("STREAM_CREATE_EXC", BUNDLE), e);
+ }
+
+ message.setContent(XMLStreamReader.class, reader);
+ }
+
+ protected XMLInputFactory getXMLInputFactory() {
+ if (xif == null) {
+ return XMLInputFactory.newInstance();
+ }
+
+ return xif;
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,91 +1,91 @@
-package org.apache.cxf.interceptor;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.databinding.DataReader;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.BindingMessageInfo;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.MessageInfo;
-import org.apache.cxf.service.model.OperationInfo;
-import org.apache.cxf.service.model.ServiceModelUtil;
-import org.apache.cxf.staxutils.DepthXMLStreamReader;
-import org.apache.cxf.staxutils.StaxUtils;
-
-public class WrappedInInterceptor extends AbstractInDatabindingInterceptor {
- public static final String SINGLE_WRAPPED_PART = "single.wrapped.in.part";
- private static final ResourceBundle BUNDLE = BundleUtils.getBundle(WrappedInInterceptor.class);
-
- public WrappedInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
- }
-
- public void handleMessage(Message message) {
- DepthXMLStreamReader xmlReader = getXMLStreamReader(message);
-
- // Trying to find the operation name from the XML.
- if (xmlReader.getEventType() != XMLStreamConstants.START_ELEMENT
- && !StaxUtils.toNextElement(xmlReader)) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("NO_OPERATION_ELEMENT", BUNDLE));
- }
- BindingOperationInfo operation = message.getExchange().get(BindingOperationInfo.class);
- boolean requestor = isRequestor(message);
-
- if (operation == null) {
- String opName = xmlReader.getLocalName();
- if (requestor && opName.endsWith("Response")) {
- opName = opName.substring(0, opName.length() - 8);
- }
-
- // TODO: Allow overridden methods.
- operation = ServiceModelUtil.getOperation(message.getExchange(), opName);
- if (operation == null) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("NO_OPERATION", BUNDLE, opName));
- }
- message.getExchange().put(BindingOperationInfo.class, operation);
- message.getExchange().put(OperationInfo.class, operation.getOperationInfo());
- }
- if (requestor) {
- message.put(MessageInfo.class, operation.getOperationInfo().getOutput());
- message.put(BindingMessageInfo.class, operation.getOutput());
- } else {
- message.put(MessageInfo.class, operation.getOperationInfo().getInput());
- message.put(BindingMessageInfo.class, operation.getInput());
- }
-
- DataReader<XMLStreamReader> dr = getDataReader(message);
- List<Object> objects;
-
- // Determine if there is a wrapper class
- if (Boolean.TRUE.equals(operation.getOperationInfo().getProperty(SINGLE_WRAPPED_PART))) {
- objects = new ArrayList<Object>();
- Object wrappedObject = dr.read(xmlReader);
- objects.add(wrappedObject);
- } else {
- // Unwrap each part individually if we don't have a wrapper
- objects = new ArrayList<Object>();
- int depth = xmlReader.getDepth();
-
- try {
- while (xmlReader.nextTag() == XMLStreamReader.START_ELEMENT && xmlReader.getDepth() > depth) {
- objects.add(dr.read(xmlReader));
- }
- } catch (XMLStreamException e) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("STAX_READ_EXC", BUNDLE), e);
- }
- }
-
- message.setContent(List.class, objects);
- }
-
-}
-
+package org.apache.cxf.interceptor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ResourceBundle;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.databinding.DataReader;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.model.BindingMessageInfo;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.MessageInfo;
+import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.service.model.ServiceModelUtil;
+import org.apache.cxf.staxutils.DepthXMLStreamReader;
+import org.apache.cxf.staxutils.StaxUtils;
+
+public class WrappedInInterceptor extends AbstractInDatabindingInterceptor {
+ public static final String SINGLE_WRAPPED_PART = "single.wrapped.in.part";
+ private static final ResourceBundle BUNDLE = BundleUtils.getBundle(WrappedInInterceptor.class);
+
+ public WrappedInInterceptor() {
+ super();
+ setPhase(Phase.UNMARSHAL);
+ }
+
+ public void handleMessage(Message message) {
+ DepthXMLStreamReader xmlReader = getXMLStreamReader(message);
+
+ // Trying to find the operation name from the XML.
+ if (xmlReader.getEventType() != XMLStreamConstants.START_ELEMENT
+ && !StaxUtils.toNextElement(xmlReader)) {
+ throw new Fault(new org.apache.cxf.common.i18n.Message("NO_OPERATION_ELEMENT", BUNDLE));
+ }
+ BindingOperationInfo operation = message.getExchange().get(BindingOperationInfo.class);
+ boolean requestor = isRequestor(message);
+
+ if (operation == null) {
+ String opName = xmlReader.getLocalName();
+ if (requestor && opName.endsWith("Response")) {
+ opName = opName.substring(0, opName.length() - 8);
+ }
+
+ // TODO: Allow overridden methods.
+ operation = ServiceModelUtil.getOperation(message.getExchange(), opName);
+ if (operation == null) {
+ throw new Fault(new org.apache.cxf.common.i18n.Message("NO_OPERATION", BUNDLE, opName));
+ }
+ message.getExchange().put(BindingOperationInfo.class, operation);
+ message.getExchange().put(OperationInfo.class, operation.getOperationInfo());
+ }
+ if (requestor) {
+ message.put(MessageInfo.class, operation.getOperationInfo().getOutput());
+ message.put(BindingMessageInfo.class, operation.getOutput());
+ } else {
+ message.put(MessageInfo.class, operation.getOperationInfo().getInput());
+ message.put(BindingMessageInfo.class, operation.getInput());
+ }
+
+ DataReader<XMLStreamReader> dr = getDataReader(message);
+ List<Object> objects;
+
+ // Determine if there is a wrapper class
+ if (Boolean.TRUE.equals(operation.getOperationInfo().getProperty(SINGLE_WRAPPED_PART))) {
+ objects = new ArrayList<Object>();
+ Object wrappedObject = dr.read(xmlReader);
+ objects.add(wrappedObject);
+ } else {
+ // Unwrap each part individually if we don't have a wrapper
+ objects = new ArrayList<Object>();
+ int depth = xmlReader.getDepth();
+
+ try {
+ while (xmlReader.nextTag() == XMLStreamReader.START_ELEMENT && xmlReader.getDepth() > depth) {
+ objects.add(dr.read(xmlReader));
+ }
+ } catch (XMLStreamException e) {
+ throw new Fault(new org.apache.cxf.common.i18n.Message("STAX_READ_EXC", BUNDLE), e);
+ }
+ }
+
+ message.setContent(List.class, objects);
+ }
+
+}
+
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,46 +1,46 @@
-package org.apache.cxf.interceptor;
-
-import java.util.ResourceBundle;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.MessageInfo;
-
-public class WrappedOutInterceptor extends AbstractPhaseInterceptor<Message> {
- private static final ResourceBundle BUNDLE = BundleUtils.getBundle(WrappedOutInterceptor.class);
-
- public WrappedOutInterceptor() {
- super();
- setPhase(Phase.MARSHAL);
- addBefore(BareOutInterceptor.class.getName());
- }
-
- public void handleMessage(Message message) {
- BindingOperationInfo bop = message.getExchange().get(BindingOperationInfo.class);
- if (bop.isUnwrapped()) {
- XMLStreamWriter xmlWriter = getXMLStreamWriter(message);
-
- MessageInfo messageInfo = message.get(MessageInfo.class);
- QName name = messageInfo.getName();
-
- try {
- xmlWriter.writeStartElement(name.getLocalPart(), name.getNamespaceURI());
- message.getInterceptorChain().doIntercept(message);
- xmlWriter.writeEndElement();
- } catch (XMLStreamException e) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("STAX_READ_EXC", BUNDLE, e));
- }
- }
- }
-
- protected XMLStreamWriter getXMLStreamWriter(Message message) {
- return message.getContent(XMLStreamWriter.class);
- }
-}
+package org.apache.cxf.interceptor;
+
+import java.util.ResourceBundle;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.MessageInfo;
+
+public class WrappedOutInterceptor extends AbstractPhaseInterceptor<Message> {
+ private static final ResourceBundle BUNDLE = BundleUtils.getBundle(WrappedOutInterceptor.class);
+
+ public WrappedOutInterceptor() {
+ super();
+ setPhase(Phase.MARSHAL);
+ addBefore(BareOutInterceptor.class.getName());
+ }
+
+ public void handleMessage(Message message) {
+ BindingOperationInfo bop = message.getExchange().get(BindingOperationInfo.class);
+ if (bop.isUnwrapped()) {
+ XMLStreamWriter xmlWriter = getXMLStreamWriter(message);
+
+ MessageInfo messageInfo = message.get(MessageInfo.class);
+ QName name = messageInfo.getName();
+
+ try {
+ xmlWriter.writeStartElement(name.getLocalPart(), name.getNamespaceURI());
+ message.getInterceptorChain().doIntercept(message);
+ xmlWriter.writeEndElement();
+ } catch (XMLStreamException e) {
+ throw new Fault(new org.apache.cxf.common.i18n.Message("STAX_READ_EXC", BUNDLE, e));
+ }
+ }
+ }
+
+ protected XMLStreamWriter getXMLStreamWriter(Message message) {
+ return message.getContent(XMLStreamWriter.class);
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceImpl.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceImpl.java Fri Aug 25 06:16:36 2006
@@ -1,64 +1,64 @@
-package org.apache.cxf.service;
-
-import java.util.concurrent.Executor;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.databinding.DataReaderFactory;
-import org.apache.cxf.databinding.DataWriterFactory;
-import org.apache.cxf.interceptor.AbstractAttributedInterceptorProvider;
-import org.apache.cxf.service.invoker.Invoker;
-import org.apache.cxf.service.model.ServiceInfo;
-
-public class ServiceImpl extends AbstractAttributedInterceptorProvider implements Service {
-
- private ServiceInfo serviceInfo;
- private DataReaderFactory dataReaderFactory;
- private DataWriterFactory dataWriterFactory;
- private Executor executor;
- private Invoker invoker;
-
- public ServiceImpl(ServiceInfo si) {
- serviceInfo = si;
- }
-
- public QName getName() {
- return serviceInfo.getName();
- }
-
- public ServiceInfo getServiceInfo() {
- return serviceInfo;
- }
-
- public DataReaderFactory getDataReaderFactory() {
- return dataReaderFactory;
- }
-
- public void setDataReaderFactory(DataReaderFactory dataReaderFactory) {
- this.dataReaderFactory = dataReaderFactory;
- }
-
- public DataWriterFactory getDataWriterFactory() {
- return dataWriterFactory;
- }
-
- public void setDataWriterFactory(DataWriterFactory dataWriterFactory) {
- this.dataWriterFactory = dataWriterFactory;
- }
-
- public Executor getExecutor() {
- return executor;
- }
-
- public void setExecutor(Executor executor) {
- this.executor = executor;
- }
-
- public Invoker getInvoker() {
- return invoker;
- }
-
- public void setInvoker(Invoker invoker) {
- this.invoker = invoker;
- }
-}
+package org.apache.cxf.service;
+
+import java.util.concurrent.Executor;
+
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.databinding.DataReaderFactory;
+import org.apache.cxf.databinding.DataWriterFactory;
+import org.apache.cxf.interceptor.AbstractAttributedInterceptorProvider;
+import org.apache.cxf.service.invoker.Invoker;
+import org.apache.cxf.service.model.ServiceInfo;
+
+public class ServiceImpl extends AbstractAttributedInterceptorProvider implements Service {
+
+ private ServiceInfo serviceInfo;
+ private DataReaderFactory dataReaderFactory;
+ private DataWriterFactory dataWriterFactory;
+ private Executor executor;
+ private Invoker invoker;
+
+ public ServiceImpl(ServiceInfo si) {
+ serviceInfo = si;
+ }
+
+ public QName getName() {
+ return serviceInfo.getName();
+ }
+
+ public ServiceInfo getServiceInfo() {
+ return serviceInfo;
+ }
+
+ public DataReaderFactory getDataReaderFactory() {
+ return dataReaderFactory;
+ }
+
+ public void setDataReaderFactory(DataReaderFactory dataReaderFactory) {
+ this.dataReaderFactory = dataReaderFactory;
+ }
+
+ public DataWriterFactory getDataWriterFactory() {
+ return dataWriterFactory;
+ }
+
+ public void setDataWriterFactory(DataWriterFactory dataWriterFactory) {
+ this.dataWriterFactory = dataWriterFactory;
+ }
+
+ public Executor getExecutor() {
+ return executor;
+ }
+
+ public void setExecutor(Executor executor) {
+ this.executor = executor;
+ }
+
+ public Invoker getInvoker() {
+ return invoker;
+ }
+
+ public void setInvoker(Invoker invoker) {
+ this.invoker = invoker;
+ }
+}
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date