You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/08/04 16:40:29 UTC
[1/2] cxf git commit: [CXF-7466] Support for returning
CompletableFuture
Repository: cxf
Updated Branches:
refs/heads/master 13bcc2362 -> 4a663dbab
[CXF-7466] Support for returning CompletableFuture
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d48820be
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d48820be
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d48820be
Branch: refs/heads/master
Commit: d48820be51bee9a9511adac314bc456bb726e6a1
Parents: 7443f01
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Fri Aug 4 17:35:52 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Aug 4 17:35:52 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 31 +++++++++++++++++---
.../reactive/JAXRSCompletionStageTest.java | 2 --
2 files changed, 27 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d48820be/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index c0ca2ff..43def01 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -26,6 +26,8 @@ import java.lang.reflect.Proxy;
import java.util.Collections;
import java.util.List;
import java.util.ResourceBundle;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletionStage;
import java.util.logging.Logger;
import javax.ws.rs.WebApplicationException;
@@ -189,6 +191,9 @@ public class JAXRSInvoker extends AbstractInvoker {
asyncResponse = (AsyncResponseImpl)inMessage.get(AsyncResponse.class);
}
result = invoke(exchange, resourceObject, methodToInvoke, params);
+ if (asyncResponse == null && !ori.isSubResourceLocator()) {
+ asyncResponse = checkFutureResponse(inMessage, checkResultObject(result));
+ }
if (asyncResponse != null) {
if (!asyncResponse.suspendContinuationIfNeeded()) {
result = handleAsyncResponse(exchange, asyncResponse);
@@ -224,7 +229,7 @@ public class JAXRSInvoker extends AbstractInvoker {
List<MediaType> acceptContentType =
(List<MediaType>)exchange.get(Message.ACCEPT_CONTENT_TYPE);
- result = checkResultObject(result, subResourcePath);
+ result = checkSubResultObject(result, subResourcePath);
Class<?> subResponseType = null;
if (result.getClass() == Class.class) {
@@ -292,6 +297,22 @@ public class JAXRSInvoker extends AbstractInvoker {
return result;
}
+ protected AsyncResponseImpl checkFutureResponse(Message inMessage, Object result) {
+ if (result instanceof CompletionStage) {
+ final CompletionStage<?> stage = (CompletionStage<?>)result;
+ final AsyncResponseImpl asyncResponse = new AsyncResponseImpl(inMessage);
+ stage.whenComplete((v, t) -> {
+ if (t instanceof CancellationException) {
+ asyncResponse.cancel();
+ } else {
+ asyncResponse.resume(v != null ? v : t);
+ }
+ });
+ return asyncResponse;
+ }
+ return null;
+ }
+
protected Method getMethodToInvoke(ClassResourceInfo cri, OperationResourceInfo ori, Object resourceObject) {
Method resourceMethod = cri.getMethodDispatcher().getMethod(ori);
@@ -401,10 +422,8 @@ public class JAXRSInvoker extends AbstractInvoker {
- private static Object checkResultObject(Object result, String subResourcePath) {
-
+ private static Object checkResultObject(Object result) {
- //the result becomes the object that will handle the request
if (result != null) {
if (result instanceof MessageContentsList) {
result = ((MessageContentsList)result).get(0);
@@ -414,6 +433,10 @@ public class JAXRSInvoker extends AbstractInvoker {
result = ((Object[])result)[0];
}
}
+ return result;
+ }
+ private static Object checkSubResultObject(Object result, String subResourcePath) {
+ result = checkResultObject(result);
if (result == null) {
org.apache.cxf.common.i18n.Message errorM =
new org.apache.cxf.common.i18n.Message("NULL_SUBRESOURCE",
http://git-wip-us.apache.org/repos/asf/cxf/blob/d48820be/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSCompletionStageTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSCompletionStageTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSCompletionStageTest.java
index 54dabab..eb69b56 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSCompletionStageTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSCompletionStageTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.systest.jaxrs.Book;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
public class JAXRSCompletionStageTest extends AbstractBusClientServerTestBase {
@@ -54,7 +53,6 @@ public class JAXRSCompletionStageTest extends AbstractBusClientServerTestBase {
assertEquals(123L, book.getId());
}
@Test
- @Ignore
public void testGetBookAsyncStageAsyncResponse() throws Exception {
String address = "http://localhost:" + PORT + "/completable/booksAsync";
WebClient wc = createWebClient(address);
[2/2] cxf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4a663dba
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4a663dba
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4a663dba
Branch: refs/heads/master
Commit: 4a663dbab187172d809045c715c935349e4a110c
Parents: d48820b 13bcc23
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Fri Aug 4 17:36:09 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Aug 4 17:36:09 2017 +0100
----------------------------------------------------------------------
.../cxf/bus/extension/ExtensionManagerBus.java | 3 +-
.../apache/cxf/common/logging/Log4jLogger.java | 14 +-
.../org/apache/cxf/endpoint/ClientImpl.java | 4 +-
.../cxf/staxutils/DepthXMLStreamReader.java | 2 +-
.../cxf/staxutils/FragmentStreamReader.java | 13 +-
.../org/apache/cxf/staxutils/StaxUtils.java | 52 +++----
.../cxf/staxutils/DepthXMLStreamReaderTest.java | 3 +-
.../cxf/staxutils/FragmentStreamReaderTest.java | 7 +-
.../org/apache/cxf/staxutils/StaxUtilsTest.java | 9 +-
.../java/org/apache/cxf/cdi/CdiBusBean.java | 4 +-
.../cxf/cdi/JAXRSCdiResourceExtension.java | 2 +-
.../cxf/connector/CXFConnectionParam.java | 6 +-
.../cxf/jca/core/classloader/Handler.java | 3 +-
.../jca/core/classloader/PlugInClassLoader.java | 14 +-
.../classloader/PlugInClassLoaderHelper.java | 58 ++++----
.../AbstractManagedConnectionFactoryImpl.java | 9 +-
.../cxf/jca/cxf/ConnectionFactoryImpl.java | 3 +-
.../org/apache/cxf/jca/cxf/JCABusFactory.java | 7 +-
.../org/apache/cxf/jca/jarloader/JarLoader.java | 3 +-
.../outbound/ManagedConnectionFactoryImpl.java | 3 +-
.../ManagedConnectionFactoryImplTest.java | 1 +
.../cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 +
.../cxf/ManagedConnectionFactoryImplTest.java | 1 +
.../cxf/jca/cxf/ManagedConnectionImplTest.java | 1 +
.../cxf/jca/cxf/ResourceAdapterImplTest.java | 2 +
.../tracing/brave/AbstractBraveInterceptor.java | 6 +-
.../cxf/tracing/brave/BraveTracerContext.java | 3 +-
.../cxf/tracing/brave/HttpClientSpanParser.java | 3 +-
.../cxf/tracing/brave/HttpServerSpanParser.java | 3 +-
.../cxf/maven_plugin/AbstractCodegenMoho.java | 43 +++---
.../wsdl2java/WsdlOptionLoader.java | 3 +-
.../maven_plugin/javatowadl/DumpJavaDoc.java | 3 +-
.../maven_plugin/javatowadl/Java2WADLMojo.java | 5 +-
.../apache/cxf/osgi/itests/jaxrs/BookStore.java | 17 +--
.../org/apache/cxf/binding/coloc/ColocUtil.java | 3 +-
.../interceptors/CorbaStreamInInterceptor.java | 3 +-
.../CorbaStreamOutEndingInterceptor.java | 3 +-
.../corba/runtime/CorbaStreamReader.java | 14 +-
.../types/AbstractStartEndEventProducer.java | 4 +-
.../corba/types/CorbaAnyEventProducer.java | 7 +-
.../corba/types/CorbaEnumEventProducer.java | 4 +-
.../corba/types/CorbaFixedEventProducer.java | 4 +-
.../CorbaObjectReferenceEventProducer.java | 23 ++-
.../types/CorbaOctetSequenceEventProducer.java | 8 +-
.../types/CorbaPrimitiveTypeEventProducer.java | 4 +-
.../corba/types/CorbaStructListener.java | 17 +--
.../corba/utils/CorbaObjectReferenceHelper.java | 9 +-
.../cxf/binding/corba/utils/CorbaUtils.java | 147 +++++++++----------
.../binding/soap/SoapBindingConfiguration.java | 3 +-
.../interceptor/AbstractSoapInterceptor.java | 6 +-
.../soap/interceptor/CheckFaultInterceptor.java | 5 +-
.../soap/interceptor/RPCInInterceptor.java | 6 +-
.../soap/interceptor/RPCOutInterceptor.java | 2 +-
.../interceptor/ReadHeadersInterceptor.java | 8 +-
.../interceptor/Soap11FaultInInterceptor.java | 3 +-
.../interceptor/Soap12FaultOutInterceptor.java | 3 +-
.../soap/interceptor/StartBodyInterceptor.java | 5 +-
.../cxf/binding/soap/model/SoapBindingInfo.java | 3 +-
.../binding/soap/saaj/SAAJOutInterceptor.java | 5 +-
.../cxf/binding/soap/saaj/SAAJStreamWriter.java | 5 +-
.../binding/soap/SoapOutInterceptorTest.java | 9 +-
.../cxf/binding/soap/saaj/ParseBodyTest.java | 3 +-
.../interceptor/XMLMessageInInterceptor.java | 13 +-
.../java/org/apache/cxf/aegis/AegisContext.java | 6 +-
.../apache/cxf/aegis/DatabindingException.java | 7 +-
.../cxf/aegis/databinding/AegisDatabinding.java | 3 +-
.../aegis/databinding/XMLStreamDataReader.java | 5 +-
.../org/apache/cxf/aegis/type/TypeUtil.java | 21 ++-
.../apache/cxf/aegis/type/XMLTypeCreator.java | 12 +-
.../apache/cxf/aegis/type/basic/BeanType.java | 3 +-
.../cxf/aegis/type/basic/BeanTypeInfo.java | 3 +-
.../type/basic/InterfaceInvocationHandler.java | 8 +-
.../apache/cxf/aegis/type/basic/ObjectType.java | 5 +-
.../cxf/aegis/type/java5/AnnotatedTypeInfo.java | 6 +-
.../apache/cxf/aegis/type/java5/EnumType.java | 2 +-
.../cxf/aegis/type/java5/Java5TypeCreator.java | 55 ++++---
.../apache/cxf/aegis/util/NamespaceHelper.java | 9 +-
.../aegis/util/stax/JDOMNamespaceContext.java | 3 +-
.../aegis/util/stax/W3CNamespaceContext.java | 3 +-
.../cxf/aegis/xml/stax/ElementReader.java | 7 +-
.../cxf/aegis/xml/stax/ElementWriter.java | 7 +-
.../aegis/inheritance/InheritanceService.java | 4 +-
.../cxf/aegis/inheritance/ws1/impl/WS1Impl.java | 3 +-
.../aegis/type/encoded/SoapArrayTypeTest.java | 8 +-
.../apache/cxf/aegis/xml/stax/ReaderTest.java | 3 +-
.../apache/cxf/jaxb/JAXBContextInitializer.java | 3 +-
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 21 +--
.../apache/cxf/jaxb/JAXBSchemaInitializer.java | 6 +-
.../org/apache/cxf/jaxb/JAXBWrapperHelper.java | 3 +-
.../apache/cxf/jaxb/WrapperHelperCompiler.java | 3 +-
.../attachment/JAXBAttachmentMarshaller.java | 6 +-
.../org/apache/cxf/jaxb/io/DataReaderImpl.java | 23 ++-
.../org/apache/cxf/jaxb/io/DataWriterImpl.java | 6 +-
.../apache/cxf/clustering/RetryStrategy.java | 5 +-
.../logging/event/DefaultLogEventMapper.java | 24 ++-
.../cxf/throttling/SimpleThrottlingManager.java | 3 +-
.../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 11 +-
.../org/apache/cxf/jaxrs/JAXRSServiceImpl.java | 3 +-
.../JAXRSServerFactoryBeanDefinitionParser.java | 3 +-
.../cxf/jaxrs/ext/MessageContextImpl.java | 3 +-
.../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 9 +-
.../jaxrs/impl/AbstractResponseContextImpl.java | 8 +-
.../cxf/jaxrs/impl/AsyncResponseImpl.java | 3 +-
.../jaxrs/impl/CacheControlHeaderProvider.java | 18 +--
.../jaxrs/impl/ContainerRequestContextImpl.java | 11 +-
.../apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 34 ++---
.../jaxrs/impl/HttpServletRequestFilter.java | 6 +-
.../apache/cxf/jaxrs/impl/LinkBuilderImpl.java | 19 +--
.../cxf/jaxrs/impl/LinkHeaderProvider.java | 3 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 6 +-
.../org/apache/cxf/jaxrs/impl/MetadataMap.java | 10 +-
.../cxf/jaxrs/impl/NewCookieHeaderProvider.java | 6 +-
.../apache/cxf/jaxrs/impl/PathSegmentImpl.java | 3 +-
.../cxf/jaxrs/impl/ReaderInterceptorMBR.java | 2 +-
.../cxf/jaxrs/impl/ResponseBuilderImpl.java | 3 +-
.../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 26 ++--
.../jaxrs/provider/AbstractJAXBProvider.java | 3 +-
.../cxf/jaxrs/provider/ProviderFactory.java | 4 +-
.../provider/RequestDispatcherProvider.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 2 +-
.../validation/JAXRSBeanValidationInvoker.java | 2 +-
.../jaxb/jaxbelement/ParamJAXBElement.java | 11 +-
.../jaxrs/provider/DataSourceProviderTest.java | 4 +-
.../provider/FormEncodingProviderTest.java | 39 +++--
.../provider/PrimitiveTextProviderTest.java | 2 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 2 +-
.../cxf/jaxrs/provider/SourceProviderTest.java | 2 +-
.../cxf/jaxrs/provider/XPathProviderTest.java | 2 +-
.../cxf/jaxws/EndpointReferenceBuilder.java | 2 +-
.../blueprint/EndpointDefinitionParser.java | 6 +-
.../dynamic/JaxWsDynamicClientFactory.java | 3 +-
.../logical/LogicalHandlerOutInterceptor.java | 4 +-
.../handler/soap/SOAPHandlerInterceptor.java | 3 +-
.../apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 4 +-
.../cxf/jaxws/dispatch/DispatchOpTest.java | 5 +-
.../apache/cxf/jaxws/dispatch/DispatchTest.java | 5 +-
.../jaxws/handler/HandlerChainInvokerTest.java | 16 +-
.../endpoint/dynamic/DynamicClientFactory.java | 8 +-
.../ServerFactoryBeanDefinitionParser.java | 3 +-
.../ResponseTimeMessageInInterceptor.java | 4 +-
.../ResponseTimeMessageInvokerInterceptor.java | 4 +-
.../ResponseTimeMessageOutInterceptor.java | 2 +-
.../cxf/jaxrs/client/ClientProviderFactory.java | 2 +-
.../cxf/jaxrs/client/JaxrsClientCallback.java | 4 +-
.../CacheControlClientReaderInterceptor.java | 2 +-
.../client/spec/ClientResponseContextImpl.java | 2 +-
.../cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
.../provider/json/SimpleTypeJsonProvider.java | 2 +-
.../cxf/jaxrs/rx/provider/ObservableReader.java | 2 +-
.../ext/search/tika/TikaContentExtractor.java | 3 +-
.../jpa/JPATypedQueryVisitorFiqlTest.java | 2 +-
.../jpa/JPATypedQueryVisitorODataTest.java | 2 +-
.../jose/common/KeyManagementUtils.java | 2 +-
.../jwe/AesGcmContentEncryptionAlgorithm.java | 4 +-
.../security/jose/jws/JwsJsonConsumerTest.java | 6 +-
.../DefaultEHCacheOAuthDataProvider.java | 2 +-
.../provider/OAuthServerJoseJwtProducer.java | 4 +-
.../oauth2/services/AccessTokenService.java | 2 +-
.../services/AuthorizationCodeGrantService.java | 2 +-
.../rs/security/oauth2/utils/EHCacheUtil.java | 2 +-
.../security/oidc/idp/FormIdTokenResponse.java | 2 +-
.../rs/security/oidc/utils/OidcUtilsTest.java | 4 +-
.../saml/sso/EHCacheTokenReplayCache.java | 4 +-
.../cxf/rs/security/saml/sso/EHCacheUtil.java | 2 +-
.../saml/sso/SamlPostBindingFilter.java | 2 +-
.../saml/sso/state/EHCacheSPStateManager.java | 4 +-
.../saml/sso/AbstractSAMLCallbackHandler.java | 6 +-
.../saml/sso/CombinedValidatorTest.java | 6 +-
.../saml/sso/SAMLResponseValidatorTest.java | 2 +-
.../saml/sso/SAMLSSOResponseValidatorTest.java | 2 +-
.../cxf/rs/security/common/RSSecurityUtils.java | 2 +-
.../apache/cxf/rs/security/saml/SAMLUtils.java | 2 +-
.../interceptor/WSS4JBasicAuthValidator.java | 6 +-
.../http_jetty/JettyHTTPServerEngine.java | 2 +-
.../JettyHTTPServerEngineFactoryHolder.java | 4 +-
.../http_jetty/JettyHTTPDestinationTest.java | 8 +-
.../http/netty/client/NettyHttpConduit.java | 4 +-
.../netty/server/NettyHttpDestinationTest.java | 8 +-
.../UndertowHTTPServerEngineFactoryHolder.java | 4 +-
.../osgi/HTTPUndertowTransportActivator.java | 2 +-
.../UndertowHTTPDestinationTest.java | 8 +-
.../http/auth/AbstractSpnegoAuthSupplier.java | 2 +-
.../HttpConduitBPBeanDefinitionParser.java | 3 +-
.../HttpDestinationBPBeanDefinitionParser.java | 3 +-
.../cxf/transport/servlet/CXFServlet.java | 2 +-
.../cxf/transport/jms/JMSHeaderTypeTest.java | 2 +-
.../apache/cxf/transport/udp/UDPConduit.java | 2 +-
.../websocket/ahc/AhcWebSocketConduit.java | 2 +-
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 8 +-
.../ws/addressing/soap/VersionTransformer.java | 87 ++++-------
.../cxf/ws/addressing/soap/MAPCodecTest.java | 96 ++++++------
.../policy/ClientPolicyInFaultInterceptor.java | 2 +-
.../cxf/ws/policy/PolicyInInterceptor.java | 2 +-
.../cxf/ws/policy/PolicyOutInterceptor.java | 2 +-
.../policy/ServerPolicyOutFaultInterceptor.java | 2 +-
.../cxf/ws/rm/persistence/PersistenceUtils.java | 2 +-
.../cxf/ws/rm/policy/RM12AssertionBuilder.java | 3 +-
.../cxf/ws/rm/policy/RMPolicyUtilities.java | 5 +-
.../FragmentDialectLanguageXPath10.java | 2 +-
.../wsdl/interceptors/BareInInterceptor.java | 3 +-
.../org/apache/cxf/xkms/cache/EHCacheUtil.java | 2 +-
.../provider/XkmsCryptoProviderFactory.java | 7 +-
.../cxf/systest/grizzly/EndpointAPITest.java | 4 +-
.../validators/CustomValidatorJAXBTest.java | 6 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 2 +-
.../jaxrs/JAXRSClientServerSpringBookTest.java | 2 +-
.../extraction/JAXRSClientServerTikaTest.java | 2 +-
.../jaxrs/websocket/WebSocketTestClient.java | 2 +-
.../kerberos/common/SecurityTestUtil.java | 6 +-
.../jaxrs/kerberos/JAXRSKerberosBookTest.java | 6 +-
.../wssec/kerberos/KerberosTokenTest.java | 21 +--
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 13 +-
.../grants/CallbackHandlerLoginHandler.java | 4 +-
.../jaxrs/security/saml/JAXRSSamlTest.java | 4 +-
.../systest/jms/security/JMSWSSecurityTest.java | 22 +--
.../apache/cxf/systest/jms/security/Server.java | 8 +-
.../systest/http_undertow/SessionServer.java | 3 +-
.../http_undertow/UndertowBasicAuthServer.java | 3 +-
.../http_undertow/UndertowBasicAuthTest.java | 3 +-
.../http_undertow/UndertowDigestAuthTest.java | 5 +-
.../websocket/WebSocketTestClient.java | 2 +-
.../org/apache/cxf/https/ssl3/SSLv3Test.java | 33 +++--
.../org/apache/cxf/systest/http/BareServer.java | 3 +-
.../apache/cxf/systest/http/SessionServer.java | 3 +-
.../http_jetty/JettyBasicAuthServer.java | 3 +-
.../systest/http_jetty/JettyBasicAuthTest.java | 3 +-
.../systest/http_jetty/JettyDigestAuthTest.java | 5 +-
.../https/ciphersuites/CipherSuitesTest.java | 73 ++++-----
.../https/clientauth/ClientAuthTest.java | 29 ++--
.../hostname/HostnameVerificationTest.java | 17 ++-
.../systest/https/trust/TrustManagerTest.java | 21 +--
.../apache/cxf/systest/bus/BusShutdownTest.java | 3 +-
.../ws/rm/MessageCallbackOnewayTest.java | 2 +-
.../wssec/examples/saml/SamlTokenTest.java | 45 +++---
.../secconv/SecureConversationTest.java | 5 +-
.../wssec/examples/ut/UsernameTokenTest.java | 29 ++--
.../wssec/examples/x509/X509TokenTest.java | 17 ++-
.../systest/ws/addr_responses/HelloService.java | 2 +-
.../apache/cxf/systest/ws/addr_wsdl/Server.java | 5 +-
.../ws/addressing/AbstractGreeterImpl.java | 2 +-
.../systest/ws/addressing/HeaderVerifier.java | 14 +-
.../cxf/systest/ws/addressing/MAPTestBase.java | 6 +-
.../cxf/systest/ws/addressing/MAPVerifier.java | 10 +-
.../greeter_control/AbstractGreeterImpl.java | 3 +-
.../jaxb_element_test/JaxbElementTestImpl.java | 3 +-
.../java/org/apache/cxf/test/XPathAssert.java | 28 ++--
.../cxf/testutil/common/ServerLauncher.java | 19 ++-
.../AnnotatedGreeterImpl.java | 5 +-
.../AnnotatedGreeterNoOverloadImpl.java | 5 +-
.../AnotherDerivedGreeterImpl.java | 5 +-
.../DerivedGreeterImpl.java | 5 +-
.../RPCLitGreeterImpl.java | 3 +-
.../cxf/tools/common/ProcessorTestBase.java | 3 +-
.../apache/cxf/tools/common/ToolContext.java | 19 +--
.../cxf/tools/common/model/JavaMethod.java | 7 +-
.../apache/cxf/tools/common/model/JavaType.java | 9 +-
.../cxf/tools/common/toolspec/ToolSpec.java | 6 +-
.../toolspec/parser/CommandLineParser.java | 15 +-
.../cxf/tools/common/toolspec/parser/Form.java | 3 +-
.../tools/common/toolspec/parser/Option.java | 12 +-
.../common/toolspec/parser/OptionGroup.java | 3 +-
.../apache/cxf/tools/util/AnnotationUtil.java | 3 +-
.../apache/cxf/tools/util/ToolsStaxUtils.java | 13 +-
.../tools/corba/processors/idl/IDLLexer.java | 25 ++--
.../corba/common/ProcessorEnvironment.java | 6 +-
.../cxf/tools/corba/common/SchemaFactory.java | 5 +-
.../tools/corba/common/WSDLCorbaFactory.java | 5 +-
.../idlpreprocessor/IdlPreprocessorReader.java | 3 +-
.../corba/processors/idl/IDLProcessor.java | 3 +-
.../processors/idl/IDLToWSDLProcessor.java | 12 +-
.../corba/processors/idl/ModuleToNSMapper.java | 50 +++----
.../processors/idl/ObjectReferenceVisitor.java | 3 +-
.../corba/processors/idl/OperationVisitor.java | 23 ++-
.../cxf/tools/corba/processors/idl/Scope.java | 11 +-
.../corba/processors/wsdl/WSDLParameter.java | 26 ++--
.../processors/wsdl/WSDLToCorbaBinding.java | 65 ++++----
.../processors/wsdl/WSDLToCorbaHelper.java | 42 +++---
.../corba/processors/wsdl/WSDLToIDLAction.java | 46 +++---
.../java2js/processor/JavaToJSProcessor.java | 3 +-
.../cxf/tools/java2ws/util/JavaFirstUtil.java | 3 +-
.../generator/wsdl11/FaultBeanGenerator.java | 3 +-
.../processor/JavaToWSDLProcessor.java | 3 +-
.../internal/jaxws/JAXWSFrontEndProcessor.java | 3 +-
.../internal/MIMEBindingValidator.java | 19 ++-
.../internal/UniqueBodyPartsValidator.java | 3 +-
.../validator/internal/WSIBPValidator.java | 3 +-
.../tools/wadlto/jaxb/CustomizationParser.java | 3 +-
.../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 6 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 31 ++--
.../tools/wsdlto/core/AbstractGenerator.java | 2 +-
.../databinding/jaxb/JAXBDataBinding.java | 13 +-
.../jaxws/customization/JAXWSBindingParser.java | 6 +-
.../processor/internal/PortTypeProcessor.java | 3 +-
.../jaxws/processor/internal/ProcessorUtil.java | 18 +--
.../processor/internal/ServiceProcessor.java | 26 ++--
.../jaxws/validator/UniqueBodyValidator.java | 15 +-
.../WrapperStyleNameCollisionValidator.java | 6 +-
.../jaxws/wsdl11/CustomizedWSDLLocator.java | 5 +-
298 files changed, 1272 insertions(+), 1472 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4a663dba/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
----------------------------------------------------------------------