cxf git commit: CXF-7349: Resolve NPE when TCCL is null
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 01121feb0 -> 4fd67ac58
CXF-7349: Resolve NPE when TCCL is null
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4fd67ac5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4fd67ac5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4fd67ac5
Branch: refs/heads/3.1.x-fixes
Commit: 4fd67ac588d5452f5b01abd97962399fbe43faa1
Parents: 01121fe
Author: Andy McCright
Authored: Thu Apr 27 16:09:55 2017 -0500
Committer: Andy McCright
Committed: Mon Jun 12 09:25:48 2017 -0500
--
.../common/classloader/ClassLoaderUtils.java| 21 +++---
.../classloader/ClassLoaderUtilsTest.java | 79
2 files changed, 89 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4fd67ac5/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
--
diff --git
a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
index cc73cf8..90b0626 100644
--- a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
@@ -89,11 +89,10 @@ public final class ClassLoaderUtils {
* @param callingClass The Class object of the calling object
*/
public static URL getResource(String resourceName, Class callingClass) {
-URL url =
Thread.currentThread().getContextClassLoader().getResource(resourceName);
+URL url = getContextClassLoader().getResource(resourceName);
if (url == null && resourceName.startsWith("/")) {
//certain classloaders need it without the leading /
-url = Thread.currentThread().getContextClassLoader()
-.getResource(resourceName.substring(1));
+url =
getContextClassLoader().getResource(resourceName.substring(1));
}
ClassLoader cluClassloader = ClassLoaderUtils.class.getClassLoader();
@@ -151,16 +150,14 @@ public final class ClassLoaderUtils {
};
try {
-urls = Thread.currentThread().getContextClassLoader()
-.getResources(resourceName);
+urls = getContextClassLoader().getResources(resourceName);
} catch (IOException e) {
//ignore
}
if (!urls.hasMoreElements() && resourceName.startsWith("/")) {
//certain classloaders need it without the leading /
try {
-urls = Thread.currentThread().getContextClassLoader()
-.getResources(resourceName.substring(1));
+urls =
getContextClassLoader().getResources(resourceName.substring(1));
} catch (IOException e) {
// ignore
}
@@ -295,16 +292,18 @@ public final class ClassLoaderUtils {
}
}
-private static ClassLoader getContextClassLoader() {
+static ClassLoader getContextClassLoader() {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
return AccessController.doPrivileged(new
PrivilegedAction() {
public ClassLoader run() {
-return Thread.currentThread().getContextClassLoader();
+ClassLoader loader =
Thread.currentThread().getContextClassLoader();
+return loader != null ? loader :
ClassLoader.getSystemClassLoader();
}
});
-}
-return Thread.currentThread().getContextClassLoader();
+}
+ClassLoader loader = Thread.currentThread().getContextClassLoader();
+return loader != null ? loader : ClassLoader.getSystemClassLoader();
}
private static ClassLoader getClassLoader(final Class clazz) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4fd67ac5/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
--
diff --git
a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
new file mode 100644
index 000..8e1fa18
--- /dev/null
+++
b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License");
[3/7] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
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/eec3cd48 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eec3cd48 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eec3cd48 Branch: refs/heads/master Commit: eec3cd484749630e599732a082e45d60ef1d10d7 Parents: 751e63a e00b842 Author: Andy McCright Authored: Wed Apr 5 09:48:33 2017 -0500 Committer: Andy McCright Committed: Wed Apr 5 09:48:33 2017 -0500 -- core/pom.xml| 2 +- .../org/apache/cxf/annotations/Logging.java | 1 + .../cxf/attachment/AttachmentDeserializer.java | 20 +- .../apache/cxf/attachment/AttachmentImpl.java | 2 +- .../apache/cxf/attachment/AttachmentUtil.java | 10 +- .../cxf/attachment/Base64DecoderStream.java | 3 +- .../cxf/bus/extension/ExtensionManagerBus.java | 36 +- .../cxf/bus/extension/ExtensionRegistry.java| 2 +- .../BusWiringBeanFactoryPostProcessor.java | 2 +- .../apache/cxf/bus/spring/NamespaceHandler.java | 4 +- .../apache/cxf/bus/spring/SpringBusFactory.java | 4 +- .../catalog/CatalogXmlSchemaURIResolver.java| 2 +- .../apache/cxf/catalog/OASISCatalogManager.java | 38 ++- .../common/classloader/ClassLoaderUtils.java| 41 ++- .../org/apache/cxf/common/i18n/BundleUtils.java | 35 +- .../cxf/common/injection/ResourceInjector.java | 2 +- .../cxf/common/jaxb/JAXBContextCache.java | 2 +- .../org/apache/cxf/common/jaxb/JAXBUtils.java | 35 +- .../jaxb/SchemaCollectionContextProxy.java | 2 +- .../org/apache/cxf/common/logging/LogUtils.java | 45 ++- .../org/apache/cxf/common/util/ASMHelper.java | 7 +- .../org/apache/cxf/common/util/ClassHelper.java | 5 - .../apache/cxf/common/util/PackageUtils.java| 5 +- .../apache/cxf/common/util/PrimitiveUtils.java | 7 +- .../org/apache/cxf/common/util/ProxyHelper.java | 31 +- .../apache/cxf/common/util/ReflectionUtil.java | 17 + .../cxf/common/util/SpringClasspathScanner.java | 2 +- .../org/apache/cxf/common/util/StringUtils.java | 2 +- .../org/apache/cxf/common/util/UrlUtils.java| 2 +- .../cxf/common/util/WeakIdentityHashMap.java| 2 +- .../common/util/XmlSchemaPrimitiveUtils.java| 2 +- .../cxf/common/xmlschema/SchemaCollection.java | 2 +- .../jsse/TLSClientParametersConfig.java | 2 +- .../jsse/TLSParameterJaxBUtils.java | 21 +- .../jsse/TLSServerParametersConfig.java | 2 +- .../cxf/databinding/AbstractDataBinding.java| 2 +- .../databinding/source/XMLStreamDataWriter.java | 111 +- .../cxf/endpoint/AbstractEndpointFactory.java | 2 +- .../java/org/apache/cxf/endpoint/Client.java| 2 +- .../org/apache/cxf/endpoint/ClientImpl.java | 29 +- .../org/apache/cxf/feature/LoggingFeature.java | 2 +- .../java/org/apache/cxf/helpers/DOMUtils.java | 30 +- .../java/org/apache/cxf/helpers/FileUtils.java | 2 +- .../apache/cxf/helpers/HttpHeaderHelper.java| 2 +- .../java/org/apache/cxf/helpers/IOUtils.java| 5 +- .../apache/cxf/helpers/MapNamespaceContext.java | 2 +- .../java/org/apache/cxf/helpers/XPathUtils.java | 16 +- .../interceptor/AbstractLoggingInterceptor.java | 1 + .../interceptor/AttachmentOutInterceptor.java | 4 + .../cxf/interceptor/ClientFaultConverter.java | 2 +- .../apache/cxf/interceptor/LoggingMessage.java | 1 + .../cxf/interceptor/StaxInInterceptor.java | 2 +- .../cxf/interceptor/StaxOutInterceptor.java | 2 +- .../security/SecureAnnotationsInterceptor.java | 2 +- .../security/SimpleAuthorizingInterceptor.java | 4 +- .../cxf/internal/CXFAPINamespaceHandler.java| 5 +- .../apache/cxf/phase/PhaseInterceptorChain.java | 2 +- .../org/apache/cxf/resource/URIResolver.java| 14 +- .../org/apache/cxf/service/ServiceImpl.java | 2 +- .../factory/AbstractServiceFactoryBean.java | 2 +- .../factory/AnnotationsFactoryBeanListener.java | 11 - .../factory/FactoryBeanListenerManager.java | 3 +- .../factory/OldLoggingFactoryBeanListener.java | 77 + .../service/model/AbstractPropertiesHolder.java | 2 +- .../apache/cxf/service/model/MessageInfo.java | 2 +- .../cxf/service/model/ServiceModelUtil.java | 2 +- .../cxf/staxutils/CachingXmlEventWriter.java| 2 +- .../cxf/staxutils/W3CDOMStreamReader.java | 7 +- .../staxutils/transform/InTransformReader.java | 4 +- .../staxutils/transform/OutTransformWriter.java | 4 +- .../cxf/transport/TransportURIResolver.java | 9 +- .../org/apache/cxf/ws/addressing/Names.java | 2 + .../schemas/configuration/security.xsd | 16 + .../java/org/apache/cxf/bus/CXFBusImplTest.java | 2 +- .../cxf/bus/extension/ExtensionManagerTest.java | 2 +- .../cxf/bus/spring/BusD
[6/7] cxf git commit: CXF-7349: Resolve NPE when TCCL is null
CXF-7349: Resolve NPE when TCCL is null
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7043ded4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7043ded4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7043ded4
Branch: refs/heads/master
Commit: 7043ded41dc7484a9c47b3a191ee70802c11
Parents: cb14bf9
Author: Andy McCright
Authored: Thu Apr 27 16:09:55 2017 -0500
Committer: Andy McCright
Committed: Thu Apr 27 16:09:55 2017 -0500
--
.../common/classloader/ClassLoaderUtils.java| 21 +++---
.../classloader/ClassLoaderUtilsTest.java | 79
2 files changed, 89 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/7043ded4/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
--
diff --git
a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
index df7d30e..ce39516 100644
--- a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
@@ -89,11 +89,10 @@ public final class ClassLoaderUtils {
* @param callingClass The Class object of the calling object
*/
public static URL getResource(String resourceName, Class callingClass) {
-URL url =
Thread.currentThread().getContextClassLoader().getResource(resourceName);
+URL url = getContextClassLoader().getResource(resourceName);
if (url == null && resourceName.startsWith("/")) {
//certain classloaders need it without the leading /
-url = Thread.currentThread().getContextClassLoader()
-.getResource(resourceName.substring(1));
+url =
getContextClassLoader().getResource(resourceName.substring(1));
}
ClassLoader cluClassloader = ClassLoaderUtils.class.getClassLoader();
@@ -151,16 +150,14 @@ public final class ClassLoaderUtils {
};
try {
-urls = Thread.currentThread().getContextClassLoader()
-.getResources(resourceName);
+urls = getContextClassLoader().getResources(resourceName);
} catch (IOException e) {
//ignore
}
if (!urls.hasMoreElements() && resourceName.startsWith("/")) {
//certain classloaders need it without the leading /
try {
-urls = Thread.currentThread().getContextClassLoader()
-.getResources(resourceName.substring(1));
+urls =
getContextClassLoader().getResources(resourceName.substring(1));
} catch (IOException e) {
// ignore
}
@@ -295,16 +292,18 @@ public final class ClassLoaderUtils {
}
}
-private static ClassLoader getContextClassLoader() {
+static ClassLoader getContextClassLoader() {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
return AccessController.doPrivileged(new
PrivilegedAction() {
public ClassLoader run() {
-return Thread.currentThread().getContextClassLoader();
+ClassLoader loader =
Thread.currentThread().getContextClassLoader();
+return loader != null ? loader :
ClassLoader.getSystemClassLoader();
}
});
-}
-return Thread.currentThread().getContextClassLoader();
+}
+ClassLoader loader = Thread.currentThread().getContextClassLoader();
+return loader != null ? loader : ClassLoader.getSystemClassLoader();
}
private static ClassLoader getClassLoader(final Class clazz) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/7043ded4/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
--
diff --git
a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
new file mode 100644
index 000..8e1fa18
--- /dev/null
+++
b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the Lic
[7/7] cxf git commit: CXF-7349 Merge branch 'NPE-ClassLoaderUtils' of github.com:andymc12/cxf
CXF-7349 Merge branch 'NPE-ClassLoaderUtils' of github.com:andymc12/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/20663ce5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20663ce5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20663ce5 Branch: refs/heads/master Commit: 20663ce50eb1210cfbfa765dfadefe702c6ed920 Parents: 59c2f5a 7043ded Author: Andy McCright Authored: Mon Jun 12 09:05:57 2017 -0500 Committer: Andy McCright Committed: Mon Jun 12 09:05:57 2017 -0500 -- .../common/classloader/ClassLoaderUtils.java| 21 +++--- .../classloader/ClassLoaderUtilsTest.java | 79 2 files changed, 89 insertions(+), 11 deletions(-) --
[4/7] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
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/8f38958d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8f38958d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8f38958d Branch: refs/heads/master Commit: 8f38958d75d23edb9b711b6d9c77e663091412ab Parents: eec3cd4 9a19f69 Author: Andy McCright Authored: Thu Apr 20 15:14:20 2017 -0500 Committer: Andy McCright Committed: Thu Apr 20 15:14:20 2017 -0500 -- .../org/apache/cxf/common/util/CacheMap.java| 10 ++ .../org/apache/cxf/common/util/Compiler.java| 2 +- .../apache/cxf/continuations/Continuation.java | 11 +- .../java/org/apache/cxf/helpers/DOMUtils.java | 54 .../cxf/staxutils/W3CDOMStreamWriter.java | 16 ++- .../apache/cxf/common/util/CacheMapTest.java| 50 +++ .../src/main/resources/META-INF/beans.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 2 +- .../cdi/src/main/resources/META-INF/beans.xml | 2 +- integration/jca/pom.xml | 16 ++- integration/spring-boot/autoconfigure/pom.xml | 37 + .../boot/autoconfigure/CxfProperties.java | 6 +- .../boot/autoconfigure/CxfPropertiesTest.java | 86 .../features/src/main/resources/features.xml| 2 + parent/pom.xml | 13 +- pom.xml | 4 +- .../interceptor/Soap12FaultInInterceptor.java | 3 +- .../binding/soap/saaj/SAAJInInterceptor.java| 2 + .../cxf/binding/soap/saaj/SAAJStreamWriter.java | 2 +- .../apache/cxf/binding/soap/saaj/SAAJUtils.java | 61 ++--- rt/bindings/xml/pom.xml | 6 + .../apache/cxf/jaxrs/impl/ResourceInfoImpl.java | 2 +- .../apache/cxf/jaxrs/utils/InjectionUtils.java | 4 +- .../interceptors/MessageModeOutInterceptor.java | 1 + .../rs/security/jose/common/JoseConstants.java | 10 ++ .../jose/common/KeyManagementUtils.java | 5 +- .../cxf/rs/security/jose/jwe/JweUtils.java | 34 - .../cxf/rs/security/jose/jws/JwsUtils.java | 31 - .../cxf/rs/security/jose/jwt/JwtConstants.java | 1 + rt/rs/security/oauth-parent/oauth2/pom.xml | 2 +- .../cxf/rs/security/oauth2/client/Consumer.java | 4 + .../oauth2/filters/OAuthRequestFilter.java | 15 ++ .../code/AuthorizationCodeGrantHandler.java | 1 + .../provider/AbstractOAuthDataProvider.java | 9 ++ .../oauth2/services/AbstractTokenService.java | 106 +++--- .../services/DynamicRegistrationService.java| 38 +++-- .../rs/security/oauth2/utils/JwtTokenUtils.java | 13 +- .../security/oauth2/utils/OAuthConstants.java | 3 +- .../rs/security/oauth2/utils/OAuthUtils.java| 80 +++ rt/rs/security/sso/oidc/pom.xml | 2 +- .../rs/security/xml/SignatureProperties.java| 8 ++ .../rs/security/xml/XmlSecOutInterceptor.java | 4 + rt/rs/sse/src/main/resources/META-INF/beans.xml | 2 +- .../apache/cxf/transport/jms/JMSConduit.java| 23 .../cxf/transport/jms/JMSConfiguration.java | 27 ++-- .../cxf/transport/jms/JMSDestination.java | 4 +- .../apache/cxf/transport/jms/JMSFactory.java| 2 +- .../AtmosphereWebSocketServletDestination.java | 22 +++ .../ws/eventing/shared/utils/FilteringUtil.java | 2 + .../ws/security/wss4j/CXFCallbackLookup.java| 3 + .../security/wss4j/CryptoCoverageChecker.java | 2 + .../wss4j/PolicyBasedWSS4JOutInterceptor.java | 2 +- .../ws/security/wss4j/SamlTokenInterceptor.java | 1 + .../cxf/ws/security/wss4j/StaxSerializer.java | 50 --- .../ws/security/wss4j/WSS4JInInterceptor.java | 71 -- .../policyhandlers/AbstractBindingBuilder.java | 36 +++-- .../AsymmetricBindingHandler.java | 9 +- .../policyhandlers/TransportBindingHandler.java | 9 +- .../AbstractSupportingTokenPolicyValidator.java | 2 + .../RequiredElementsPolicyValidator.java| 7 +- .../SecuredPartsPolicyValidator.java| 7 +- .../wss4j/AbstractPolicySecurityTest.java | 2 +- .../wss4j/PolicyBasedWss4JInOutTest.java| 6 + .../main/resources/META-INF/jax-ws-catalog.xml | 7 + .../apache/cxf/ws/discovery/wsdl/ws-addr.xsd| 137 +++ services/wsn/wsn-core/pom.xml | 28 services/xkms/xkms-itests/pom.xml | 5 + .../base/src/main/resources/META-INF/beans.xml | 2 +- .../src/test/resources/META-INF/beans.xml | 2 +- .../src/test/resources/META-INF/beans.xml | 2 +- systests/cdi/cdi-owb/pom.xml| 4 +- .../src/test/resources/META-INF/beans.xml | 2 +- .../src/test/resources/META-INF/beans.xml | 2 +- systests/jaxrs/pom.xml |
[1/7] [cxf] Git Push Summary
Repository: cxf Updated Branches: refs/heads/master 59c2f5ab1 -> 20663ce50
[5/7] cxf git commit: Merge branch 'master' of https://github.com/apache/cxf
Merge branch 'master' of https://github.com/apache/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cb14bf9a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cb14bf9a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cb14bf9a Branch: refs/heads/master Commit: cb14bf9ac392a7936aff08d7e54dd12720f8e733 Parents: 8f38958 7fab624 Author: Andy McCright Authored: Thu Apr 27 15:57:26 2017 -0500 Committer: Andy McCright Committed: Thu Apr 27 15:57:26 2017 -0500 -- .../cxf/attachment/ImageDataContentHandler.java | 4 +- .../cxf/common/jaxb/JAXBContextCache.java | 5 +- .../org/apache/cxf/common/util/CacheMap.java| 2 +- .../apache/cxf/configuration/jsse/SSLUtils.java | 16 +- .../jsse/TLSParameterJaxBUtils.java | 10 +- .../java/org/apache/cxf/helpers/FileUtils.java | 3 +- .../java/org/apache/cxf/helpers/IOUtils.java| 6 +- .../helpers/LoadingByteArrayOutputStream.java | 14 +- .../org/apache/cxf/io/CachedOutputStream.java | 10 +- .../java/org/apache/cxf/io/CachedWriter.java| 6 +- .../org/apache/cxf/resource/URIResolver.java| 4 +- .../org/apache/cxf/staxutils/StaxUtils.java | 4 +- .../apache/cxf/common/util/CacheMapTest.java| 3 + .../src/main/resources/application.yml | 2 + .../java/demo/jms_greeter/client/Client.java| 9 +- distribution/src/main/release/samples/pom.xml | 2 +- .../maven_plugin/wsdl2java/WSDL2JavaMojo.java | 7 +- .../maven_plugin/javatowadl/DumpJavaDoc.java| 12 +- .../javatowadl/ResourceMapJavaDocProvider.java | 10 +- osgi/itests/pom.xml | 95 +-- .../osgi/itests/BundlesAndNamespacesTest.java | 7 +- .../cxf/osgi/itests/CXFOSGiTestSupport.java | 222 +-- osgi/itests/src/test/resources/log4j.properties | 5 + parent/pom.xml | 12 +- pom.xml | 4 +- .../cxf/binding/corba/utils/OrbConfig.java | 5 +- .../cxf/jaxrs/AbstractJAXRSFactoryBean.java | 4 +- .../cxf/jaxrs/provider/BinaryDataProvider.java | 11 +- .../cxf/jaxrs/provider/MultipartProvider.java | 4 +- .../AbstractSpringComponentScanServer.java | 151 +++-- .../AbstractSpringConfigurationFactory.java | 7 +- .../endpoint/dynamic/DynamicClientFactory.java | 10 +- .../persistence/FilesystemExchangeDataDAO.java | 5 +- rt/rs/client/pom.xml| 7 +- .../jaxrs/client/logging/RESTLoggingTest.java | 110 ++-- .../swagger/DefaultSwagger2Serializers.java | 8 +- .../cxf/jaxrs/swagger/Swagger2Feature.java | 5 +- .../cxf/jaxrs/json/basic/JsonMapObject.java | 9 + .../security/jose/jws/JwsCompactConsumer.java | 1 + .../cxf/rs/security/oauth2/common/Client.java | 11 +- .../filters/AccessTokenIntrospectionClient.java | 2 + .../oauth2/filters/JwtAccessTokenValidator.java | 12 +- .../oauth2/filters/OAuthRequestFilter.java | 4 +- .../code/AuthorizationCodeGrantHandler.java | 1 - .../provider/AbstractOAuthDataProvider.java | 13 +- .../DefaultEHCacheOAuthDataProvider.java| 42 +- .../oauth2/provider/OAuthJSONProvider.java | 19 +- .../services/DynamicRegistrationService.java| 39 +- .../rs/security/oauth2/utils/EHCacheUtil.java | 42 ++ .../rs/security/oauth2/utils/JwtTokenUtils.java | 16 +- .../security/oauth2/utils/OAuthConstants.java | 11 +- .../http_undertow/UndertowHTTPDestination.java | 7 +- .../http_undertow/UndertowHTTPHandler.java | 6 + .../httpclient/PublicSuffixMatcherLoader.java | 4 +- rt/transports/jms/pom.xml | 8 +- .../apache/cxf/transport/jms/JMSConduit.java| 2 +- .../apache/cxf/transport/jms/JMSConstants.java | 18 +- .../cxf/transport/jms/JMSDestination.java | 9 +- .../transport/jms/JMSMessageHeadersType.java| 245 ++-- .../cxf/transport/jms/JMSMessageUtils.java | 381 +++- .../cxf/transport/jms/JMSPropertyType.java | 26 +- .../transport/jms/SecurityContextFactory.java | 75 +++ .../transport/jms/spec/JMSSpecConstants.java| 5 +- .../util/PollingMessageListenerContainer.java | 93 +-- .../cxf/transport/jms/JMSDestinationTest.java | 7 +- .../cxf/transport/jms/JMSHeaderTypeTest.java| 73 +++ .../transport/jms/util/MessageListenerTest.java | 72 ++- rt/transports/websocket/pom.xml | 6 + .../websocket/WebSocketDestinationFactory.java | 98 ++- .../AtmosphereWebSocketUndertowDestination.java | 294 + .../undertow/ByteBufferInputStream.java | 51 ++ .../undertow/UndertowWebSocketDestination.java | 232 .../WebSocketUndertowServletRequest.java| 593 +++ .../WebSocketUndertowServletResponse.java | 392 .../x509/repo/file/FileCertific
[2/3] cxf git commit: Adding test for WSS-608
Adding test for WSS-608
# Conflicts:
#
systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ab155fc3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ab155fc3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ab155fc3
Branch: refs/heads/3.1.x-fixes
Commit: ab155fc3383c59b6bc71181e80de513c1e591955
Parents: 0222111
Author: Colm O hEigeartaigh
Authored: Mon Jun 12 13:14:43 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Mon Jun 12 14:02:41 2017 +0100
--
.../cxf/systest/ws/https/HttpsTokenTest.java| 34 +---
.../cxf/systest/ws/https/DoubleItHttps.wsdl | 3 ++
.../org/apache/cxf/systest/ws/https/client.xml | 16 +
.../cxf/systest/ws/https/nochild-policy.xml | 27
.../org/apache/cxf/systest/ws/https/server.xml | 7
.../apache/cxf/systest/ws/https/stax-server.xml | 10 ++
6 files changed, 93 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ab155fc3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
--
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
index 4dbbf8f..461264e 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
@@ -130,7 +130,7 @@ public class HttpsTokenTest extends
AbstractBusClientServerTestBase {
((java.io.Closeable)port).close();
bus.shutdown(true);
}
-
+
@org.junit.Test
public void testNoClientCertRequirement() throws Exception {
@@ -158,7 +158,7 @@ public class HttpsTokenTest extends
AbstractBusClientServerTestBase {
} catch (Exception ex) {
// expected
}
-
+
// This should work, as we're disable the RequireClientCertificate
check via a
// JAX-WS property
portQName = new QName(NAMESPACE,
"DoubleItNoClientCertRequirementPort2");
@@ -170,7 +170,7 @@ public class HttpsTokenTest extends
AbstractBusClientServerTestBase {
}
port.doubleIt(25);
-
+
((java.io.Closeable)port).close();
bus.shutdown(true);
}
@@ -220,5 +220,31 @@ public class HttpsTokenTest extends
AbstractBusClientServerTestBase {
((java.io.Closeable)port).close();
bus.shutdown(true);
}
-
+
+@org.junit.Test
+public void testNoChildPolicy() throws Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = HttpsTokenTest.class.getResource("client.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl");
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, "DoubleItNoChildPolicyPort");
+DoubleItPortType port =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(port, test.getPort());
+
+if (test.isStreaming()) {
+SecurityTestUtil.enableStreaming(port);
+}
+
+port.doubleIt(25);
+
+((java.io.Closeable)port).close();
+bus.shutdown(true);
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ab155fc3/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
--
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
index 9def79d..09ebfbe 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
@@ -53,5 +53,8 @@
https://localhost:9009/DoubleItBasicAuth2"/>
+
+https://localhost:9009/DoubleItNoChildPolicy"/>
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/ab155fc3/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
--
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
b/systests/ws-security/src/test/
[1/3] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 02221113b -> 01121feb0 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e0072e7e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e0072e7e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e0072e7e Branch: refs/heads/3.1.x-fixes Commit: e0072e7e5d971e65f4b080e03f3c5c487e3ebec1 Parents: ab155fc Author: Colm O hEigeartaigh Authored: Mon Jun 12 14:02:41 2017 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jun 12 14:02:41 2017 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/e0072e7e/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 022dc13..f8d5c77 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -504,6 +504,7 @@ M 5724e615409916ce3176d430cb91bae44f3447d9 M 574b2a9997c94011794fa2e083181e23c9936f15 M 585df048b7730ee36644a4bb7c1a20fcf977d79e M 5954d4ce3c9713c17c3bbb8b730fad210aebfb3a +M 59c2f5ab18b7b39f1e1cdf74910a6de03dcc8a31 M 59cab46f45733b07b1b90c4510d4466d97447323 M 5afec44d741580762fb5d6f4f4fac7d34446ae95 M 5b7b014cc1d24cba1191bc07fd48b13dbf4d4391
[3/3] cxf git commit: Updating to WSS4J SNAPSHOT
Updating to WSS4J SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/01121feb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01121feb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01121feb Branch: refs/heads/3.1.x-fixes Commit: 01121feb0813d8788d208f5e77180df166286c0b Parents: e0072e7 Author: Colm O hEigeartaigh Authored: Mon Jun 12 14:07:43 2017 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jun 12 14:07:43 2017 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/01121feb/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index b9bd9da..d155481 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -161,7 +161,7 @@ 4.4.1 3.1.4 1.6.3 -2.1.9 +2.1.10-SNAPSHOT 2.11.0 2.6.0 2.2.2
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes b2f183c02 -> 8341f4e08 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8341f4e0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8341f4e0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8341f4e0 Branch: refs/heads/3.0.x-fixes Commit: 8341f4e08507b0d71281db813aa1fb37370c29ca Parents: b2f183c Author: Colm O hEigeartaigh Authored: Mon Jun 12 14:52:28 2017 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jun 12 14:52:28 2017 +0100 -- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/8341f4e0/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 84defcd..bea97f4 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -6,6 +6,7 @@ B 004321a2e955665005b9c5bfe304feaf9cb622b0 B 004a87831c55655f2b91054eaeb3fff0f8e8986f B 00589e44810f2d8cf1a830bb80842067c73cb8c2 B 005ee936d42897f7083fd9fe26addec4779d4764 +B 01121feb0813d8788d208f5e77180df166286c0b B 013eb89d0453bf897d219b762e50ab5232f6ca00 B 015419bf394e219cbb07ca7706b4bd8e2942e856 B 015d7a6dde4e201aaf8eaa90343b6ca9a20f6856 @@ -1188,6 +1189,7 @@ B aac1196c9e2ad02b596e24cc6f18cdb7ec30a21d B aafbcde58a0ef31e76bdb99592ef685456a7 B ab0393e171b256c41043f192eb7c2c13928be670 B ab05845f33e5744f9ed9c2b3569a1001c269f923 +B ab155fc3383c59b6bc71181e80de513c1e591955 B ab1e3ebf03c142df876be561e6720e788b7c6dac B ab20d353990b20e72500d00e128c0a72d5dcf329 B ab3817f5068d88c60dc15ce52504435f9b715c1b @@ -1555,6 +1557,7 @@ B dfa59762b50f26263716bae769bc4078d4059c37 B dfb180895cb0ee3a544c1a8a40246e781b051423 B dfb5f378bbd1ceab46478a9983efb0c30b629446 B dfecaa60ea6082fda8f2959c083ba2f2f7a03112 +B e0072e7e5d971e65f4b080e03f3c5c487e3ebec1 B e038e3149ff842a0a92259611864acdbe3bda650 B e0b56c9e6accb8fd7985cd33ca99391c3a8d76a1 B e0dd6d9741e21f5f1cf494b106d7ffdfa9ddbe93
cxf git commit: Adding test for WSS-608
Repository: cxf
Updated Branches:
refs/heads/master aaa8fde1e -> 59c2f5ab1
Adding test for WSS-608
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/59c2f5ab
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/59c2f5ab
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/59c2f5ab
Branch: refs/heads/master
Commit: 59c2f5ab18b7b39f1e1cdf74910a6de03dcc8a31
Parents: aaa8fde
Author: Colm O hEigeartaigh
Authored: Mon Jun 12 13:14:43 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Mon Jun 12 13:14:43 2017 +0100
--
.../cxf/systest/ws/https/HttpsTokenTest.java| 32 ++--
.../cxf/systest/ws/https/DoubleItHttps.wsdl | 3 ++
.../org/apache/cxf/systest/ws/https/client.xml | 16 ++
.../cxf/systest/ws/https/nochild-policy.xml | 27 +
.../org/apache/cxf/systest/ws/https/server.xml | 7 +
.../apache/cxf/systest/ws/https/stax-server.xml | 10 ++
6 files changed, 92 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/59c2f5ab/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
--
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
index 2875780..e1a854a 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
@@ -130,7 +130,7 @@ public class HttpsTokenTest extends
AbstractBusClientServerTestBase {
((java.io.Closeable)port).close();
bus.shutdown(true);
}
-
+
@org.junit.Test
public void testNoClientCertRequirement() throws Exception {
@@ -158,7 +158,7 @@ public class HttpsTokenTest extends
AbstractBusClientServerTestBase {
} catch (Exception ex) {
// expected
}
-
+
// This should work, as we're disable the RequireClientCertificate
check via a
// JAX-WS property
portQName = new QName(NAMESPACE,
"DoubleItNoClientCertRequirementPort2");
@@ -170,7 +170,7 @@ public class HttpsTokenTest extends
AbstractBusClientServerTestBase {
}
port.doubleIt(25);
-
+
((java.io.Closeable)port).close();
bus.shutdown(true);
}
@@ -221,4 +221,30 @@ public class HttpsTokenTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+@org.junit.Test
+public void testNoChildPolicy() throws Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = HttpsTokenTest.class.getResource("client.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl");
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, "DoubleItNoChildPolicyPort");
+DoubleItPortType port =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(port, test.getPort());
+
+if (test.isStreaming()) {
+SecurityTestUtil.enableStreaming(port);
+}
+
+port.doubleIt(25);
+
+((java.io.Closeable)port).close();
+bus.shutdown(true);
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/59c2f5ab/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
--
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
index 9def79d..09ebfbe 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl
@@ -53,5 +53,8 @@
https://localhost:9009/DoubleItBasicAuth2"/>
+
+https://localhost:9009/DoubleItNoChildPolicy"/>
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/59c2f5ab/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
--
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
index 6572805..8d9af58 100644
cxf-dosgi git commit: Fix description
Repository: cxf-dosgi Updated Branches: refs/heads/master 640516eac -> caaacede6 Fix description Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/caaacede Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/caaacede Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/caaacede Branch: refs/heads/master Commit: caaacede656160fb2840b21e50558141f552463c Parents: 640516e Author: Christian Schneider Authored: Mon Jun 12 11:30:17 2017 +0200 Committer: Christian Schneider Committed: Mon Jun 12 11:30:17 2017 +0200 -- Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/caaacede/Readme.md -- diff --git a/Readme.md b/Readme.md index c624b8d..16ff485 100644 --- a/Readme.md +++ b/Readme.md @@ -16,8 +16,8 @@ CXF DOSGi allows to easily publish and consume SOAP and REST services without us ## Intents -A service can list the named intents it requires. It will then only be exported / imported -once all the intents are available. This allows for example security restrictions or logging. +Intents allow a service to leverage CXF extensions like features. A service can list the named intents it requires. +It will then only be exported / imported once all the intents are available. This allows for example security restrictions or logging. For more informations see [common module](common). ## Build
cxf-dosgi git commit: Fix typo
Repository: cxf-dosgi Updated Branches: refs/heads/master b647637a9 -> 640516eac Fix typo Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/640516ea Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/640516ea Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/640516ea Branch: refs/heads/master Commit: 640516eac9c7efa1237b37842db143c55bea970d Parents: b647637 Author: Christian Schneider Authored: Mon Jun 12 11:26:38 2017 +0200 Committer: Christian Schneider Committed: Mon Jun 12 11:26:38 2017 +0200 -- Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/640516ea/Readme.md -- diff --git a/Readme.md b/Readme.md index 25774ac..c624b8d 100644 --- a/Readme.md +++ b/Readme.md @@ -11,8 +11,8 @@ CXF DOSGi allows to easily publish and consume SOAP and REST services without us * [provider-rs - REST transport](provider-rs) * [decorator - Support for exporting existing services](decorator) -* [Examples](samples). -* [Distributions](distribution). +* [Examples](samples) +* [Distributions](distribution) ## Intents
cxf-dosgi git commit: Fix provider-rs readme
Repository: cxf-dosgi Updated Branches: refs/heads/master 17e1c64dd -> b647637a9 Fix provider-rs readme Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/b647637a Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/b647637a Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/b647637a Branch: refs/heads/master Commit: b647637a99c8105ae2f75ca98d092135008b871f Parents: 17e1c64 Author: Christian Schneider Authored: Mon Jun 12 11:25:35 2017 +0200 Committer: Christian Schneider Committed: Mon Jun 12 11:25:35 2017 +0200 -- provider-rs/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/b647637a/provider-rs/Readme.md -- diff --git a/provider-rs/Readme.md b/provider-rs/Readme.md index 843f060..4a562a3 100644 --- a/provider-rs/Readme.md +++ b/provider-rs/Readme.md @@ -14,4 +14,4 @@ REST based transport for Aries RSA. The exported service must be annotated with # Sample -See sample greeter-rest +See [sample rest](../samples/rest).
cxf-dosgi git commit: Fix provider-ws readme
Repository: cxf-dosgi Updated Branches: refs/heads/master e19390dd4 -> 17e1c64dd Fix provider-ws readme Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/17e1c64d Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/17e1c64d Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/17e1c64d Branch: refs/heads/master Commit: 17e1c64dd8a8253e092a55df869d126136b25e87 Parents: e19390d Author: Christian Schneider Authored: Mon Jun 12 11:23:49 2017 +0200 Committer: Christian Schneider Committed: Mon Jun 12 11:23:49 2017 +0200 -- provider-ws/Readme.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/17e1c64d/provider-ws/Readme.md -- diff --git a/provider-ws/Readme.md b/provider-ws/Readme.md index 14547c6..874d270 100644 --- a/provider-ws/Readme.md +++ b/provider-ws/Readme.md @@ -19,7 +19,7 @@ then JAX-WS mode is used else simple mode is used. ## Simple This mode uses the CXF simple frontend and the Aegis Databinding. It can export almost any service but is not much configureable. Aegis is also not very popular anymore. So this -mode is more for exporting existing services and small tests. +mode for exporting existing services and small tests. For most cases the JAX-WS mode is recommended. ## JAX-WS @@ -28,4 +28,5 @@ the CXF JAX-WS frontend and the JAXB databinding. It can be customized using the # Samples -See sample greeter +See [sample soap](../samples/soap). +
cxf-dosgi git commit: Fix readme links
Repository: cxf-dosgi Updated Branches: refs/heads/master 691014f89 -> e19390dd4 Fix readme links Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/e19390dd Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/e19390dd Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/e19390dd Branch: refs/heads/master Commit: e19390dd451b1ac3d66450a0206682a63f9e2eed Parents: 691014f Author: Christian Schneider Authored: Mon Jun 12 11:20:37 2017 +0200 Committer: Christian Schneider Committed: Mon Jun 12 11:20:37 2017 +0200 -- Readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/e19390dd/Readme.md -- diff --git a/Readme.md b/Readme.md index 5e024f7..25774ac 100644 --- a/Readme.md +++ b/Readme.md @@ -7,9 +7,9 @@ CXF DOSGi allows to easily publish and consume SOAP and REST services without us ## Modules * [common - Common services like intents and HTTPService support](common). -* [provider-ws - SOAP transport] (provider-ws) -* [provider-rs - REST transport] (provider-rs) -* [decorator - Support for exporting existing services] (decorator) +* [provider-ws - SOAP transport](provider-ws) +* [provider-rs - REST transport](provider-rs) +* [decorator - Support for exporting existing services](decorator) * [Examples](samples). * [Distributions](distribution).
