[1/2] cxf git commit: CXF-7489: Stax2Validation doesn't support schema imports.

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master ecac53e02 -> 09aacad7d


CXF-7489: Stax2Validation doesn't support schema imports.


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9cb5b21d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9cb5b21d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9cb5b21d

Branch: refs/heads/master
Commit: 9cb5b21db2b3912ae84cb2cf6e0e040a821745d8
Parents: ecac53e
Author: facundov 
Authored: Tue Aug 29 11:32:53 2017 -0300
Committer: Daniel Kulp 
Committed: Wed Aug 30 16:38:48 2017 -0400

--
 .../validation/Stax2ValidationUtils.java|  65 +--
 .../validation/Stax2ValidationUtilsTest.java| 175 +++
 core/src/test/resources/schemas/echoSchema.xsd  |  20 +++
 core/src/test/resources/schemas/logSchema.xsd   |  15 ++
 .../resources/schemas/schemaWithImports.xsd |   4 +
 5 files changed, 261 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9cb5b21d/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
 
b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
index 40d996c..6418b0b 100644
--- 
a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
@@ -25,10 +25,13 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import org.apache.cxf.common.i18n.Message;
@@ -39,6 +42,7 @@ import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.staxutils.DepthXMLStreamReader;
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaExternal;
 import org.codehaus.stax2.XMLStreamReader2;
 import org.codehaus.stax2.XMLStreamWriter2;
 import org.codehaus.stax2.validation.ValidationProblemHandler;
@@ -54,6 +58,7 @@ class Stax2ValidationUtils {
 private static final String KEY = XMLValidationSchema.class.getName();
 
 private static final boolean HAS_WOODSTOX;
+
 static {
 boolean hasw = false;
 try {
@@ -61,7 +66,7 @@ class Stax2ValidationUtils {
 new W3CMultiSchemaFactory(); // will throw if wrong woodstox.
 hasw = true;
 } catch (Throwable t) {
-//ignore
+// ignore
 }
 HAS_WOODSTOX = hasw;
 }
@@ -78,15 +83,15 @@ class Stax2ValidationUtils {
  * @throws XMLStreamException
  */
 public boolean setupValidation(XMLStreamReader reader, Endpoint endpoint, 
ServiceInfo serviceInfo)
-throws XMLStreamException {
+throws XMLStreamException {
 
 // Gosh, this is bad, but I don't know a better solution, unless we're 
willing
 // to require the stax2 API no matter what.
 XMLStreamReader effectiveReader = reader;
 if (effectiveReader instanceof DepthXMLStreamReader) {
-effectiveReader = ((DepthXMLStreamReader)reader).getReader();
+effectiveReader = ((DepthXMLStreamReader) reader).getReader();
 }
-final XMLStreamReader2 reader2 = (XMLStreamReader2)effectiveReader;
+final XMLStreamReader2 reader2 = (XMLStreamReader2) effectiveReader;
 XMLValidationSchema vs = getValidator(endpoint, serviceInfo);
 if (vs == null) {
 return false;
@@ -95,7 +100,7 @@ class Stax2ValidationUtils {
 
 public void reportProblem(XMLValidationProblem problem) throws 
XMLValidationException {
 throw new Fault(new Message("READ_VALIDATION_ERROR", LOG, 
problem.getMessage()),
-Fault.FAULT_CODE_CLIENT);
+Fault.FAULT_CODE_CLIENT);
 }
 });
 reader2.validateAgainst(vs);
@@ -103,9 +108,9 @@ class Stax2ValidationUtils {
 }
 
 public boolean setupValidation(XMLStreamWriter writer, Endpoint endpoint, 
ServiceInfo serviceInfo)
-throws XMLStreamException {
+throws XMLStreamException {
 
-XMLStreamWriter2 writer2 = (XMLStreamWriter2)writer;
+XMLStreamWriter2 writer2 = (XMLStreamWriter2) writer;
 XMLValidationSchema vs = getValidator(endpoint, serviceInfo);
   

[cxf-fediz] Git Push Summary [forced push!] [Forced Update!]

[sergeyb]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.4.x-fixes b95bea190 -> 186939536 (forced update)

cxf git commit: Minor update to the Flowable test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master eec5aaf5a -> ecac53e02


Minor update to the Flowable test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ecac53e0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ecac53e0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ecac53e0

Branch: refs/heads/master
Commit: ecac53e0214447404664c81b7f04eccc8bd1ed3a
Parents: eec5aaf
Author: Sergey Beryozkin 
Authored: Wed Aug 30 17:20:26 2017 +0100
Committer: Sergey Beryozkin 
Committed: Wed Aug 30 17:20:26 2017 +0100

--
 .../jaxrs/reactive/JAXRSRxJava2FlowableTest.java   | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ecac53e0/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java
index 6e89960..1b70db0 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java
@@ -36,15 +36,12 @@ import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
 import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvoker;
 import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvokerProvider;
-import org.apache.cxf.jaxrs.rx2.client.ObservableRxInvoker;
-import org.apache.cxf.jaxrs.rx2.client.ObservableRxInvokerProvider;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import io.reactivex.Flowable;
-import io.reactivex.Observable;
 
 public class JAXRSRxJava2FlowableTest extends AbstractBusClientServerTestBase {
 public static final String PORT = RxJava2FlowableServer.PORT;
@@ -112,9 +109,9 @@ public class JAXRSRxJava2FlowableTest extends 
AbstractBusClientServerTestBase {
 public void testGetHelloWorldAsyncObservable() throws Exception {
 String address = "http://localhost:; + PORT + 
"/rx2/flowable/textAsync";
 WebClient wc = WebClient.create(address,
-Collections.singletonList(new 
ObservableRxInvokerProvider()));
-Observable obs = wc.accept("text/plain")
-.rx(ObservableRxInvoker.class)
+Collections.singletonList(new 
FlowableRxInvokerProvider()));
+Flowable obs = wc.accept("text/plain")
+.rx(FlowableRxInvoker.class)
 .get(String.class);
 
 Thread.sleep(2000);
@@ -128,9 +125,9 @@ public class JAXRSRxJava2FlowableTest extends 
AbstractBusClientServerTestBase {
 @Test
 public void testGetHelloWorldAsyncObservable404() throws Exception {
 String address = "http://localhost:; + PORT + 
"/rx2/flowable/textAsync404";
-Invocation.Builder b = ClientBuilder.newClient().register(new 
ObservableRxInvokerProvider())
+Invocation.Builder b = ClientBuilder.newClient().register(new 
FlowableRxInvokerProvider())
 .target(address).request();
-b.rx(ObservableRxInvoker.class).get(String.class).subscribe(
+b.rx(FlowableRxInvoker.class).get(String.class).subscribe(
 s -> {
 fail("Exception expected");
 },

cxf-fediz git commit: [FEDIZ-207] Introducing FedizPrincipal.getId()

[sergeyb]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 6dda060e3 -> d0f79c5dd


[FEDIZ-207] Introducing FedizPrincipal.getId()


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d0f79c5d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d0f79c5d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d0f79c5d

Branch: refs/heads/master
Commit: d0f79c5dd871674ca87fe40500f2ed80218a2646
Parents: 6dda060
Author: Sergey Beryozkin 
Authored: Wed Aug 30 16:54:41 2017 +0100
Committer: Sergey Beryozkin 
Committed: Wed Aug 30 16:58:05 2017 +0100

--
 .../java/org/apache/cxf/fediz/core/FedizPrincipal.java|  1 +
 .../cxf/fediz/core/federation/TestSigninHandler.java  |  6 ++
 .../apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java|  9 +
 .../apache/cxf/fediz/jetty9/FederationUserPrincipal.java  | 10 +-
 .../authentication/FederationAuthenticationToken.java |  8 
 .../authentication/FederationAuthenticationToken.java |  8 
 .../apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java |  9 -
 .../cxf/fediz/service/oidc/FedizSubjectCreator.java   |  4 ++--
 8 files changed, 51 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d0f79c5d/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java
--
diff --git 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java
index f74991a..10cf6f0 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java
@@ -32,4 +32,5 @@ public interface FedizPrincipal extends Principal {
 
 List getRoleClaims();
 
+String getId();
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d0f79c5d/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java
--
diff --git 
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java
 
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java
index b7a5802..1317fd1 100644
--- 
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java
+++ 
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java
@@ -92,6 +92,12 @@ public class TestSigninHandler extends 
SigninHandler {
 return roles;
 }
 
+@Override
+public String getId() {
+// TODO Auto-generated method stub
+return null;
+}
+
 }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d0f79c5d/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java
--
diff --git 
a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java
 
b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java
index 325de9c..326fff5 100644
--- 
a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java
+++ 
b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java
@@ -20,6 +20,7 @@ package org.apache.cxf.fediz.cxf.plugin;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
 import org.w3c.dom.Element;
 import org.apache.cxf.fediz.core.Claim;
@@ -28,10 +29,12 @@ import org.apache.cxf.fediz.core.FedizPrincipal;
 
 public class CXFFedizPrincipal implements FedizPrincipal {
 
+private String principalId;
 private final String subject;
 private final List claims;
 private Element token;
 private List roles = Collections.emptyList();
+
 
 public CXFFedizPrincipal(String subject, List claims, List 
roles, Element token) {
 this.subject = subject;
@@ -40,6 +43,7 @@ public class CXFFedizPrincipal implements FedizPrincipal {
 if (roles != null) {
 this.roles = roles;
 }
+principalId = UUID.randomUUID().toString();
 }
 
 @Override
@@ -60,4 +64,9 @@ public class CXFFedizPrincipal implements FedizPrincipal {
 public List getRoleClaims() {
 return Collections.unmodifiableList(roles);
 }
+
+@Override
+public String getId() {
+return principalId;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d0f79c5d/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserPrincipal.java
--

[2/2] cxf-fediz git commit: Merge branch '1.4.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf-fediz into 1.4.x-fixes

[sergeyb]

Merge branch '1.4.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf-fediz 
into 1.4.x-fixes


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b95bea19
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b95bea19
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b95bea19

Branch: refs/heads/1.4.x-fixes
Commit: b95bea190362444949a9a9ef61ee6a9914290272
Parents: 53c34c2 1869395
Author: Sergey Beryozkin 
Authored: Wed Aug 30 16:54:51 2017 +0100
Committer: Sergey Beryozkin 
Committed: Wed Aug 30 16:54:51 2017 +0100

--
 pom.xml   |  4 ++--
 .../cxf/fediz/systests/custom/CustomParametersTest.java   |  2 +-
 .../fediz/integrationtests/federation/FederationTest.java |  4 ++--
 .../apache/cxf/fediz/integrationtests/SAMLSSOTest.java|  2 +-
 .../cxf/fediz/systests/federation/unknown/WSFedTest.java  | 10 +-
 .../org/apache/cxf/fediz/integrationtests/WSFedTest.java  |  2 +-
 .../java/org/apache/cxf/fediz/systests/idp/IdpTest.java   |  2 +-
 .../ClientCertificatePreAuthSpringTest.java   |  2 +-
 .../cxf/fediz/integrationtests/ClientCertificateTest.java |  2 +-
 .../fediz/integrationtests/JettyPreAuthSpringTest.java|  2 +-
 .../org/apache/cxf/fediz/integrationtests/JettyTest.java  |  2 +-
 .../apache/cxf/fediz/integrationtests/KerberosTest.java   |  6 +++---
 .../org/apache/cxf/fediz/integrationtests/LDAPTest.java   |  2 +-
 .../java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java |  6 +++---
 .../java/org/apache/cxf/fediz/systests/idp/IdpTest.java   |  2 +-
 .../apache/cxf/fediz/integrationtests/Spring3Test.java|  2 +-
 .../org/apache/cxf/fediz/integrationtests/SpringTest.java |  2 +-
 .../fediz/integrationtests/AudienceRestrictionTest.java   |  2 +-
 .../cxf/fediz/integrationtests/ClientCertificateTest.java |  2 +-
 .../cxf/fediz/integrationtests/HolderOfKeyTest.java   |  2 +-
 .../org/apache/cxf/fediz/integrationtests/TomcatTest.java |  2 +-
 .../org/apache/cxf/fediz/integrationtests/WReqTest.java   |  2 +-
 22 files changed, 32 insertions(+), 32 deletions(-)
--

cxf git commit: [CXF-7474] Checking all the resources if UI is required (always by default) and making it possible to disable it from the properties file too

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d0370a3d0 -> 0b5f511f0


[CXF-7474] Checking all the resources if UI is required (always by default) and 
making it possible to disable it from the properties file too


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0b5f511f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0b5f511f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0b5f511f

Branch: refs/heads/3.1.x-fixes
Commit: 0b5f511f01631cc28f12e383b949c72e8afe432e
Parents: d0370a3
Author: Sergey Beryozkin 
Authored: Wed Aug 30 16:10:48 2017 +0100
Committer: Sergey Beryozkin 
Committed: Wed Aug 30 16:16:18 2017 +0100

--
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 33 +++-
 .../cxf/jaxrs/swagger/SwaggerUiResolver.java| 15 +
 2 files changed, 32 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0b5f511f/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index dfbbf11..5340e23 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -93,6 +93,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 private static final String FILTER_CLASS_PROPERTY = "filter.class";
 private static final String HOST_PROPERTY = "host";
 private static final String USE_PATH_CFG_PROPERTY = 
"use.path.based.config";
+private static final String SUPPORT_UI_PROPERTY = "support.swagger.ui";
 
 private boolean runAsFilter;
 
@@ -102,7 +103,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 
 private Swagger2Serializers swagger2Serializers;
 
-private boolean supportSwaggerUi = true;
+private Boolean supportSwaggerUi;
 
 private String swaggerUiVersion;
 
@@ -158,8 +159,9 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 if (runAsFilter) {
 providers.add(new SwaggerContainerRequestFilter(appInfo == null ? 
null : appInfo.getProvider()));
 }
-
-if (supportSwaggerUi) {
+
+Properties swaggerProps = getSwaggerProperties(bus);
+if (checkSupportSwaggerUiProp(swaggerProps)) {
 String swaggerUiRoot = 
SwaggerUiResolver.findSwaggerUiRoot(swaggerUiMavenGroupAndArtifact, 

swaggerUiVersion);
 if (swaggerUiRoot != null) {
@@ -200,8 +202,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 BeanConfig beanConfig = appInfo == null 
 ? new BeanConfig() 
 : new ApplicationBeanConfig(appInfo.getProvider());
-initBeanConfig(bus, beanConfig);
-
+initBeanConfig(beanConfig, swaggerProps);
+
 Swagger swagger = beanConfig.getSwagger();
 if (swagger != null && securityDefinitions != null) {
 swagger.setSecurityDefinitions(securityDefinitions);
@@ -223,8 +225,18 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 
ServerProviderFactory.class.getName())).setUserProviders(providers);
 }
 
-@SuppressWarnings("deprecation")
-protected void initBeanConfig(Bus bus, BeanConfig beanConfig) {
+protected boolean checkSupportSwaggerUiProp(Properties props) {
+Boolean theSupportSwaggerUI = this.supportSwaggerUi;
+if (theSupportSwaggerUI == null && props != null && 
props.containsKey(SUPPORT_UI_PROPERTY)) {
+theSupportSwaggerUI = 
PropertyUtils.isTrue(props.get(SUPPORT_UI_PROPERTY));
+}
+if (theSupportSwaggerUI == null) {
+theSupportSwaggerUI = true;
+}
+return theSupportSwaggerUI;
+}
+
+protected Properties getSwaggerProperties(Bus bus) {
 InputStream is = 
ResourceUtils.getClasspathResourceStream(propertiesLocation, 
  AbstractSwaggerFeature.class, 
  bus);
@@ -237,6 +249,12 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 props = null;
 }
 }
+return props;
+}
+
+@SuppressWarnings("deprecation")
+protected void initBeanConfig(BeanConfig beanConfig, Properties props) {
+
 // resource package
 String theResourcePackage = 

cxf git commit: [CXF-7474] Checking all the resources if UI is required (always by default) and making it possible to disable it from the properties file too

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master df0c72713 -> eec5aaf5a


[CXF-7474] Checking all the resources if UI is required (always by default) and 
making it possible to disable it from the properties file too


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eec5aaf5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eec5aaf5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eec5aaf5

Branch: refs/heads/master
Commit: eec5aaf5a7974dffef5c25ddcbd1d0b3721660d0
Parents: df0c727
Author: Sergey Beryozkin 
Authored: Wed Aug 30 16:10:48 2017 +0100
Committer: Sergey Beryozkin 
Committed: Wed Aug 30 16:10:48 2017 +0100

--
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 25 
 .../cxf/jaxrs/swagger/SwaggerUiResolver.java| 16 ++---
 2 files changed, 28 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/eec5aaf5/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index eab36a6..33ee47c 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -96,6 +96,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 private static final String FILTER_CLASS_PROPERTY = "filter.class";
 private static final String HOST_PROPERTY = "host";
 private static final String USE_PATH_CFG_PROPERTY = 
"use.path.based.config";
+private static final String SUPPORT_UI_PROPERTY = "support.swagger.ui";
 
 private boolean runAsFilter;
 
@@ -103,7 +104,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 
 private String ignoreRoutes;
 
-private boolean supportSwaggerUi = true;
+private Boolean supportSwaggerUi;
 
 private String swaggerUiVersion;
 
@@ -162,7 +163,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 customizer));
 }
 
-if (supportSwaggerUi) {
+Properties swaggerProps = getSwaggerProperties(bus);
+if (checkSupportSwaggerUiProp(swaggerProps)) {
 String swaggerUiRoot = 
SwaggerUiResolver.findSwaggerUiRoot(swaggerUiMavenGroupAndArtifact, 

swaggerUiVersion);
 if (swaggerUiRoot != null) {
@@ -194,7 +196,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 BeanConfig beanConfig = appInfo == null
 ? new BeanConfig()
 : new ApplicationBeanConfig(appInfo.getProvider());
-initBeanConfig(bus, beanConfig);
+initBeanConfig(beanConfig, swaggerProps);
 
 Swagger swagger = beanConfig.getSwagger();
 if (swagger != null && securityDefinitions != null) {
@@ -211,7 +213,18 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 factory.setUserProviders(providers);
 }
 
-protected void initBeanConfig(Bus bus, BeanConfig beanConfig) {
+protected boolean checkSupportSwaggerUiProp(Properties props) {
+Boolean theSupportSwaggerUI = this.supportSwaggerUi;
+if (theSupportSwaggerUI == null && props != null && 
props.containsKey(SUPPORT_UI_PROPERTY)) {
+theSupportSwaggerUI = 
PropertyUtils.isTrue(props.get(SUPPORT_UI_PROPERTY));
+}
+if (theSupportSwaggerUI == null) {
+theSupportSwaggerUI = true;
+}
+return theSupportSwaggerUI;
+}
+
+protected Properties getSwaggerProperties(Bus bus) {
 InputStream is = 
ResourceUtils.getClasspathResourceStream(propertiesLocation, 
  AbstractSwaggerFeature.class, 
  bus);
@@ -224,6 +237,10 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 props = null;
 }
 }
+return props;
+}
+protected void initBeanConfig(BeanConfig beanConfig, Properties props) {
+
 // resource package
 String theResourcePackage = getResourcePackage();
 if (theResourcePackage == null && props != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/eec5aaf5/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
--

cxf git commit: Making sure Swagger2Feature setLicense(null) still works

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 193c5c409 -> d0370a3d0


Making sure Swagger2Feature setLicense(null) still works


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d0370a3d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d0370a3d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d0370a3d

Branch: refs/heads/3.1.x-fixes
Commit: d0370a3d0ab3d082587c01659d4c81364c865ce0
Parents: 193c5c4
Author: Sergey Beryozkin 
Authored: Wed Aug 30 15:28:33 2017 +0100
Committer: Sergey Beryozkin 
Committed: Wed Aug 30 15:36:51 2017 +0100

--
 .../jaxrs/swagger/AbstractSwaggerFeature.java   |  2 ++
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 28 ++--
 2 files changed, 16 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d0370a3d/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index fc299ee..e3e86c4 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -40,6 +40,7 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 SWAGGER_JAXRS_AVAILABLE = isSwaggerJaxRsAvailable();
 }
 
+protected boolean licenseWasSet;
 private boolean scan = true;
 private boolean runAsFilter;
 private boolean activateOnlyIfJaxrsSupported;
@@ -149,6 +150,7 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 return license;
 }
 public void setLicense(String license) {
+this.licenseWasSet = true;
 this.license = license;
 }
 public String getLicenseUrl() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/d0370a3d/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index b5e12bf..dfbbf11 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -310,24 +310,24 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 
 // license
 String theLicense = getLicense();
-if (theLicense == null && props != null) {
-theLicense = props.getProperty(LICENSE_PROPERTY);
-}
-if (theLicense == null) {
-theLicense = DEFAULT_LICENSE_VALUE;
-} else if (theLicense.isEmpty()) {
-theLicense = null;
+if (theLicense == null && !licenseWasSet) {
+if (props != null) {
+theLicense = props.getProperty(LICENSE_PROPERTY);
+if (theLicense.isEmpty()) {
+theLicense = null;
+}
+} else {
+theLicense = DEFAULT_LICENSE_VALUE;
+}
 }
 beanConfig.setLicense(theLicense);
 
 // license url
-String theLicenseUrl = null;
-if (!DEFAULT_LICENSE_VALUE.equals(theLicense)) {
-theLicenseUrl = getLicenseUrl();
-if (theLicenseUrl == null && props != null) {
-theLicenseUrl = props.getProperty(LICENSE_URL_PROPERTY);
-}
-} else {
+String theLicenseUrl = getLicenseUrl();
+if (theLicenseUrl == null && props != null) {
+theLicenseUrl = props.getProperty(LICENSE_URL_PROPERTY);
+}
+if (theLicenseUrl == null && DEFAULT_LICENSE_VALUE.equals(theLicense)) 
{
 theLicenseUrl = DEFAULT_LICENSE_URL;
 }
 beanConfig.setLicenseUrl(theLicenseUrl);

cxf-fediz git commit: Updating Tomcat8

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.4.x-fixes d6266d9dc -> 186939536


Updating Tomcat8


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/18693953
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/18693953
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/18693953

Branch: refs/heads/1.4.x-fixes
Commit: 1869395363599eeebaa1c924292be6bfc6604857
Parents: d6266d9
Author: Colm O hEigeartaigh 
Authored: Wed Aug 30 15:19:13 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Aug 30 15:33:34 2017 +0100

--
 pom.xml   |  4 ++--
 .../cxf/fediz/systests/custom/CustomParametersTest.java   |  2 +-
 .../fediz/integrationtests/federation/FederationTest.java |  4 ++--
 .../apache/cxf/fediz/integrationtests/SAMLSSOTest.java|  2 +-
 .../cxf/fediz/systests/federation/unknown/WSFedTest.java  | 10 +-
 .../org/apache/cxf/fediz/integrationtests/WSFedTest.java  |  2 +-
 .../java/org/apache/cxf/fediz/systests/idp/IdpTest.java   |  2 +-
 .../ClientCertificatePreAuthSpringTest.java   |  2 +-
 .../cxf/fediz/integrationtests/ClientCertificateTest.java |  2 +-
 .../fediz/integrationtests/JettyPreAuthSpringTest.java|  2 +-
 .../org/apache/cxf/fediz/integrationtests/JettyTest.java  |  2 +-
 .../apache/cxf/fediz/integrationtests/KerberosTest.java   |  6 +++---
 .../org/apache/cxf/fediz/integrationtests/LDAPTest.java   |  2 +-
 .../java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java |  6 +++---
 .../java/org/apache/cxf/fediz/systests/idp/IdpTest.java   |  2 +-
 .../apache/cxf/fediz/integrationtests/Spring3Test.java|  2 +-
 .../org/apache/cxf/fediz/integrationtests/SpringTest.java |  2 +-
 .../fediz/integrationtests/AudienceRestrictionTest.java   |  2 +-
 .../cxf/fediz/integrationtests/ClientCertificateTest.java |  2 +-
 .../cxf/fediz/integrationtests/HolderOfKeyTest.java   |  2 +-
 .../org/apache/cxf/fediz/integrationtests/TomcatTest.java |  2 +-
 .../org/apache/cxf/fediz/integrationtests/WReqTest.java   |  2 +-
 22 files changed, 32 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18693953/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c1ab73d..eb18bcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,8 @@
 1.7.25
 4.3.10.RELEASE
 4.2.3.RELEASE
-7.0.75
-8.5.12
+7.0.81
+8.5.20
 2.1.10
 
 http://localhost:8080/manager/text

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18693953/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
--
diff --git 
a/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
 
b/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
index af18315..307c4b2 100644
--- 
a/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
+++ 
b/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
@@ -102,7 +102,7 @@ public class CustomParametersTest {
 httpsConnector.setPort(Integer.parseInt(port));
 httpsConnector.setSecure(true);
 httpsConnector.setScheme("https");
-//httpsConnector.setAttribute("keyAlias", keyAlias);
+httpsConnector.setAttribute("keyAlias", "mytomidpkey");
 httpsConnector.setAttribute("keystorePass", "tompass");
 httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
 httpsConnector.setAttribute("truststorePass", "tompass");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18693953/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
--
diff --git 
a/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
 
b/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
index 3ab3875..e250a54 100644
--- 
a/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
+++ 
b/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
@@ -76,7 +76,7 @@ public class FederationTest extends AbstractTests {
 httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
 httpsConnector.setSecure(true);
 httpsConnector.setScheme("https");
-//httpsConnector.setAttribute("keyAlias", keyAlias);
+

cxf git commit: Making sure Swagger2Feature setLicense(null) still works

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 76145af39 -> df0c72713


Making sure Swagger2Feature setLicense(null) still works


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/df0c7271
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/df0c7271
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/df0c7271

Branch: refs/heads/master
Commit: df0c727132630165ff2c58d93c1f0cfc7eb68a4c
Parents: 76145af
Author: Sergey Beryozkin 
Authored: Wed Aug 30 15:28:33 2017 +0100
Committer: Sergey Beryozkin 
Committed: Wed Aug 30 15:28:33 2017 +0100

--
 .../jaxrs/swagger/AbstractSwaggerFeature.java   |  2 ++
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 28 ++--
 2 files changed, 16 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/df0c7271/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index e1da558..a2f9a4c 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -37,6 +37,7 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 SWAGGER_JAXRS_AVAILABLE = isSwaggerJaxRsAvailable();
 }
 
+protected boolean licenseWasSet;
 private boolean runAsFilter;
 private boolean activateOnlyIfJaxrsSupported;
 private String resourcePackage;
@@ -144,6 +145,7 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 return license;
 }
 public void setLicense(String license) {
+this.licenseWasSet = true;
 this.license = license;
 }
 public String getLicenseUrl() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/df0c7271/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index d27551b..eab36a6 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -285,24 +285,24 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 
 // license
 String theLicense = getLicense();
-if (theLicense == null && props != null) {
-theLicense = props.getProperty(LICENSE_PROPERTY);
-}
-if (theLicense == null) {
-theLicense = DEFAULT_LICENSE_VALUE;
-} else if (theLicense.isEmpty()) {
-theLicense = null;
+if (theLicense == null && !licenseWasSet) {
+if (props != null) {
+theLicense = props.getProperty(LICENSE_PROPERTY);
+if (theLicense.isEmpty()) {
+theLicense = null;
+}
+} else {
+theLicense = DEFAULT_LICENSE_VALUE;
+}
 }
 beanConfig.setLicense(theLicense);
 
 // license url
-String theLicenseUrl = null;
-if (!DEFAULT_LICENSE_VALUE.equals(theLicense)) {
-theLicenseUrl = getLicenseUrl();
-if (theLicenseUrl == null && props != null) {
-theLicenseUrl = props.getProperty(LICENSE_URL_PROPERTY);
-}
-} else {
+String theLicenseUrl = getLicenseUrl();
+if (theLicenseUrl == null && props != null) {
+theLicenseUrl = props.getProperty(LICENSE_URL_PROPERTY);
+}
+if (theLicenseUrl == null && DEFAULT_LICENSE_VALUE.equals(theLicense)) 
{
 theLicenseUrl = DEFAULT_LICENSE_URL;
 }
 beanConfig.setLicenseUrl(theLicenseUrl);

cxf-fediz git commit: Updating Tomcat8

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 6da93223c -> 6dda060e3


Updating Tomcat8


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6dda060e
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6dda060e
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6dda060e

Branch: refs/heads/master
Commit: 6dda060e3bd9b8a83dc6fd13d0b78c7444184954
Parents: 6da9322
Author: Colm O hEigeartaigh 
Authored: Wed Aug 30 15:19:13 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Aug 30 15:19:13 2017 +0100

--
 pom.xml   |  2 +-
 .../cxf/fediz/systests/custom/CustomParametersTest.java   |  2 +-
 .../org/apache/cxf/fediz/systests/cxf/FederationTest.java |  4 ++--
 .../fediz/systests/federation/samlsso/SAMLSSOTest.java|  2 +-
 .../cxf/fediz/systests/federation/unknown/WSFedTest.java  | 10 +-
 .../cxf/fediz/systests/federation/wsfed/WSFedTest.java|  2 +-
 .../java/org/apache/cxf/fediz/systests/idp/IdpTest.java   |  2 +-
 .../jetty9/ClientCertificatePreAuthSpringTest.java|  2 +-
 .../cxf/fediz/systests/jetty9/ClientCertificateTest.java  |  2 +-
 .../cxf/fediz/systests/jetty9/JettyPreAuthSpringTest.java |  2 +-
 .../org/apache/cxf/fediz/systests/jetty9/JettyTest.java   |  2 +-
 .../apache/cxf/fediz/systests/kerberos/KerberosTest.java  |  6 +++---
 .../java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java |  2 +-
 .../java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java |  6 +++---
 .../org/apache/cxf/fediz/systests/samlsso/IdpTest.java|  2 +-
 .../org/apache/cxf/fediz/systests/spring/Spring3Test.java |  2 +-
 .../org/apache/cxf/fediz/systests/spring/SpringTest.java  |  2 +-
 .../fediz/systests/tomcat8/AudienceRestrictionTest.java   |  2 +-
 .../cxf/fediz/systests/tomcat8/ClientCertificateTest.java |  2 +-
 .../cxf/fediz/systests/tomcat8/HolderOfKeyTest.java   |  2 +-
 .../org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java |  2 +-
 .../org/apache/cxf/fediz/systests/tomcat8/WReqTest.java   |  2 +-
 22 files changed, 31 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0bc8de7..5f9c0b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
 1.7.25
 4.3.10.RELEASE
 4.2.3.RELEASE
-8.5.12
+8.5.20
 2.1.10
 
 http://localhost:8080/manager/text

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
--
diff --git 
a/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
 
b/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
index f73dcbc..721d734 100644
--- 
a/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
+++ 
b/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
@@ -93,7 +93,7 @@ public class CustomParametersTest {
 httpsConnector.setPort(Integer.parseInt(port));
 httpsConnector.setSecure(true);
 httpsConnector.setScheme("https");
-//httpsConnector.setAttribute("keyAlias", keyAlias);
+httpsConnector.setAttribute("keyAlias", "mytomidpkey");
 httpsConnector.setAttribute("keystorePass", "tompass");
 httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
 httpsConnector.setAttribute("truststorePass", "tompass");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java
--
diff --git 
a/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java
 
b/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java
index b377102..162843e 100644
--- 
a/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java
+++ 
b/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java
@@ -67,7 +67,7 @@ public class FederationTest extends AbstractTests {
 httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
 httpsConnector.setSecure(true);
 httpsConnector.setScheme("https");
-//httpsConnector.setAttribute("keyAlias", keyAlias);
+httpsConnector.setAttribute("keyAlias", "mytomidpkey");
 httpsConnector.setAttribute("keystorePass", "tompass");
  

[1/2] cxf git commit: Recording .gitmergeinfo Changes

[deki]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 0198879e7 -> 193c5c409


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/45ec20ad
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/45ec20ad
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/45ec20ad

Branch: refs/heads/3.1.x-fixes
Commit: 45ec20ade8eab419fcdcad43961944894419ae69
Parents: 0198879
Author: Dennis Kieselhorst 
Authored: Wed Aug 30 16:08:26 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Wed Aug 30 16:08:26 2017 +0200

--
 .gitmergeinfo | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45ec20ad/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2aa4387..28842dc 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -648,15 +648,18 @@ M 8f8e587cde7ec97410da6b0586810ccf8f0f3233
 M 8fa9b8b14b391a419569c1050d2a5a6ffa37710d
 M 8fbf0941ca52aac406b3efcf2e0d73436c72d0f1
 M 8fc9d782901adddf874fe7c2f9500836a0585707
+M 905f619067931ff340536e75f0c3d196d5fd334f
 M 910f37767518832cce843c2a093ee833b7c48916
 M 91bb2a18f4653f997e455c5089e7a009310591c6
 M 925697fb861b5dd0be32fa04f72a60665bd2c0b0
+M 93738e5b11e641fb8b5eecc58a5e3819cc6c47e6
 M 939a75d9d3dbfbe37ead5ca41e5e53727dc40b40
 M 93b07cfd3c39f6eb62ec1f428174811a87307ba2
 M 94060fc026b3b7214337c9fcfce71c06f0fb
 M 955fd4b7fee79642934a828b7758ce14f783364a
 M 974c9d346ca9229d60a4d176b892f5920b994668
 M 97b20f61bbf7054076c8cdf609beb8a7047105b8
+M 982556218c86ad834a6bf76e62e0a77d055e291d
 M 998ce1e5df26773dc96d130b9b55c7d6eec746e7
 M 99f6eb63fa7da2a29ea9d28f1c55c5cb90a09222
 M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
@@ -707,6 +710,7 @@ M b49075882641fcebbbdf1ed8d84247fcf80aa558
 M b4b2da7507aa2d6461156089bd826c00f0bc5360
 M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b
 M b77e43f19d631d94032740eff6e58f49e0532d29
+M b9fc1c5d5ba3dfb9a7c853ac47ab41048d9e83e2
 M ba0573f202208b5e3feb881173d3df0dfc2a02ba
 M bba922fb4dca56ea4f9ba641d9456e43dbfeca47
 M be2bf8d644887fc1853210b9b82db897c4d73dd0

[2/2] cxf git commit: Fix of non thread safe map reqHeaders - SOAP_ACTION is shared between different requests

[deki]

Fix of non thread safe map reqHeaders - SOAP_ACTION is shared between different 
requests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/193c5c40
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/193c5c40
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/193c5c40

Branch: refs/heads/3.1.x-fixes
Commit: 193c5c4095d93ca8efe3e9a4b91fba705de8af46
Parents: 45ec20a
Author: Dmitry Panov 
Authored: Wed Aug 30 15:58:42 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Wed Aug 30 16:10:31 2017 +0200

--
 .../SoapPreProtocolOutInterceptor.java  | 49 ++--
 1 file changed, 25 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/193c5c40/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
index d782ea1..0035705 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
@@ -52,7 +52,7 @@ public class SoapPreProtocolOutInterceptor extends 
AbstractSoapInterceptor {
 
 /**
  * Mediate a message dispatch.
- * 
+ *
  * @param message the current message
  * @throws Fault
  */
@@ -64,10 +64,10 @@ public class SoapPreProtocolOutInterceptor extends 
AbstractSoapInterceptor {
 }
 
 }
-
+
 /**
  * Ensure the SOAP version is set for this message.
- * 
+ *
  * @param message the current message
  */
 private void ensureVersion(SoapMessage message) {
@@ -77,18 +77,18 @@ public class SoapPreProtocolOutInterceptor extends 
AbstractSoapInterceptor {
 soapVersion = 
((SoapMessage)message.getExchange().getInMessage()).getVersion();
 message.setVersion(soapVersion);
 }
-
+
 if (soapVersion == null) {
 soapVersion = Soap11.getInstance();
 message.setVersion(soapVersion);
 }
-
+
 message.put(Message.CONTENT_TYPE, soapVersion.getContentType());
 }
-
+
 /**
  * Ensure the SOAP header is set for this message.
- * 
+ *
  * @param message the current message
  */
 private void ensureMimeHeaders(SoapMessage message) {
@@ -102,32 +102,33 @@ public class SoapPreProtocolOutInterceptor extends 
AbstractSoapInterceptor {
 message.put("soap.attachement.content.transfer.encoding", cte);
 }
 }
-
+
 private void setSoapAction(SoapMessage message) {
 BindingOperationInfo boi = 
message.getExchange().getBindingOperationInfo();
-
+
 // The soap action is set on the wrapped operation.
 if (boi != null && boi.isUnwrapped()) {
 boi = boi.getWrappedOperation();
 }
-
+
 String action = getSoapAction(message, boi);
-
+
 if (message.getVersion() instanceof Soap11) {
-Map reqHeaders 
-= CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
-if (reqHeaders == null) {
-reqHeaders = new TreeMap(String.CASE_INSENSITIVE_ORDER);
+Map tempReqHeaders = new TreeMap(String.CASE_INSENSITIVE_ORDER);
+Map reqHeaders
+= CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+if (reqHeaders != null) {
+tempReqHeaders.putAll(reqHeaders);
 }
-
-if (reqHeaders.size() == 0) {
-message.put(Message.PROTOCOL_HEADERS, reqHeaders);
+
+if (!tempReqHeaders.containsKey(SoapBindingConstants.SOAP_ACTION)) 
{
+tempReqHeaders.put(SoapBindingConstants.SOAP_ACTION, 
Collections.singletonList(action));
 }
-
-reqHeaders.put(SoapBindingConstants.SOAP_ACTION, 
Collections.singletonList(action));
+
+message.put(Message.PROTOCOL_HEADERS, tempReqHeaders);
 } else if (message.getVersion() instanceof Soap12 && 
!"\"\"".equals(action)) {
 String ct = (String) message.get(Message.CONTENT_TYPE);
-
+
 if (ct.indexOf("action=\"") == -1) {
 ct = new StringBuilder().append(ct)
 .append("; action=").append(action).toString();
@@ -139,7 +140,7 @@ public class 

cxf git commit: Fix of non thread safe map reqHeaders - SOAP_ACTION is shared between different requests - This closes #307

[deki]

Repository: cxf
Updated Branches:
  refs/heads/master 5ecbf0336 -> 76145af39


Fix of non thread safe map reqHeaders - SOAP_ACTION is shared between different 
requests - This closes #307


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/76145af3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/76145af3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/76145af3

Branch: refs/heads/master
Commit: 76145af3934b56fb97b01a2b099a5fa13d56ae9c
Parents: 5ecbf03
Author: Dmitry Panov 
Authored: Wed Aug 30 15:58:42 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Wed Aug 30 15:58:42 2017 +0200

--
 .../interceptor/SoapPreProtocolOutInterceptor.java   | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/76145af3/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
index 7c78ed7..d4be2d5 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
@@ -114,17 +114,16 @@ public class SoapPreProtocolOutInterceptor extends 
AbstractSoapInterceptor {
 String action = getSoapAction(message, boi);
 
 if (message.getVersion() instanceof Soap11) {
+Map tempReqHeaders = new TreeMap(String.CASE_INSENSITIVE_ORDER);
 Map reqHeaders
-= CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
-if (reqHeaders == null) {
-reqHeaders = new TreeMap(String.CASE_INSENSITIVE_ORDER);
+= CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+if (reqHeaders != null) {
+tempReqHeaders.putAll(reqHeaders);
 }
-
-if (reqHeaders.size() == 0) {
-message.put(Message.PROTOCOL_HEADERS, reqHeaders);
+if (!tempReqHeaders.containsKey(SoapBindingConstants.SOAP_ACTION)) 
{
+tempReqHeaders.put(SoapBindingConstants.SOAP_ACTION, 
Collections.singletonList(action));
 }
-
-reqHeaders.put(SoapBindingConstants.SOAP_ACTION, 
Collections.singletonList(action));
+message.put(Message.PROTOCOL_HEADERS, tempReqHeaders);
 } else if (message.getVersion() instanceof Soap12 && 
!"\"\"".equals(action)) {
 String ct = (String) message.get(Message.CONTENT_TYPE);
 

cxf git commit: Temp reverting SwaggerUI fix again

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 253900af3 -> 8394accbc


Temp reverting SwaggerUI fix again


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8394accb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8394accb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8394accb

Branch: refs/heads/master
Commit: 8394accbc18f4f9aced4da0706f42245d773afec
Parents: 253900a
Author: Sergey Beryozkin 
Authored: Wed Aug 30 14:03:37 2017 +0100
Committer: Sergey Beryozkin 
Committed: Wed Aug 30 14:03:37 2017 +0100

--
 .../apache/cxf/jaxrs/swagger/SwaggerUiResolver.java  | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8394accb/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
index 0e5b90a..63043b18 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
@@ -52,13 +52,14 @@ public class SwaggerUiResolver {
 return root;
 }
 }
-}
-Enumeration urls = cl.getResources(UI_RESOURCES_ROOT_START);
-while (urls.hasMoreElements()) {
-String urlStr = 
urls.nextElement().toString().replace(UI_RESOURCES_ROOT_START, ""); 
-String root = checkUiRoot(urlStr, 
swaggerUiMavenGroupAndArtifact, swaggerUiVersion);
-if (root != null) {
-return root;
+} else {
+Enumeration urls = 
cl.getResources(UI_RESOURCES_ROOT_START);
+while (urls.hasMoreElements()) {
+String urlStr = 
urls.nextElement().toString().replace(UI_RESOURCES_ROOT_START, ""); 
+String root = checkUiRoot(urlStr, 
swaggerUiMavenGroupAndArtifact, swaggerUiVersion);
+if (root != null) {
+return root;
+}
 }
 }
 

[1/2] cxf git commit: [CXF-7487] More work around supporoting RxJava2

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 0872b7941 -> 253900af3


http://git-wip-us.apache.org/repos/asf/cxf/blob/253900af/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJavaServer.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJavaServer.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJavaServer.java
deleted file mode 100644
index 70f58b3..000
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJavaServer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * 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 License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.reactive;
-
-import java.util.Collections;
-
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.ext.logging.LoggingOutInterceptor;
-import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
-import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.apache.cxf.jaxrs.provider.StreamingResponseProvider;
-import org.apache.cxf.jaxrs.rx.server.ObservableInvoker;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-
-
-public class RxJavaServer extends AbstractBusTestServerBase {
-public static final String PORT = allocatePort(RxJavaServer.class);
-
-org.apache.cxf.endpoint.Server server;
-public RxJavaServer() {
-}
-
-protected void run() {
-Bus bus = BusFactory.getDefaultBus();
-// Make sure default JSONProvider is not loaded
-bus.setProperty("skip.default.json.provider.registration", true);
-JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
-sf.setInvoker(new ObservableInvoker());
-sf.setProvider(new JacksonJsonProvider());
-StreamingResponseProvider streamProvider = new 
StreamingResponseProvider();
-
streamProvider.setProduceMediaTypes(Collections.singletonList("application/json"));
-sf.setProvider(streamProvider);
-sf.getOutInterceptors().add(new LoggingOutInterceptor());
-sf.setResourceClasses(RxJavaObservableService.class);
-sf.setResourceProvider(RxJavaObservableService.class,
-   new SingletonResourceProvider(new 
RxJavaObservableService(), true));
-sf.setAddress("http://localhost:; + PORT + "/");
-server = sf.create();
-}
-
-public void tearDown() throws Exception {
-server.stop();
-server.destroy();
-server = null;
-}
-
-public static void main(String[] args) {
-try {
-RxJavaServer s = new RxJavaServer();
-s.start();
-} catch (Exception ex) {
-ex.printStackTrace();
-System.exit(-1);
-} finally {
-System.out.println("done!");
-}
-}
-
-}

[2/2] cxf git commit: [CXF-7487] More work around supporoting RxJava2

[sergeyb]

[CXF-7487] More work around supporoting RxJava2


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/253900af
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/253900af
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/253900af

Branch: refs/heads/master
Commit: 253900af377eff63e8010d86e2375e4b5c426ed6
Parents: 0872b79
Author: Sergey Beryozkin 
Authored: Wed Aug 30 14:01:51 2017 +0100
Committer: Sergey Beryozkin 
Committed: Wed Aug 30 14:01:51 2017 +0100

--
 .../cxf/jaxrs/swagger/SwaggerUiResolver.java|  16 +-
 .../rx/server/AbstractAsyncSubscriber.java  |  56 --
 .../rx/server/JsonStreamingAsyncSubscriber.java |  34 
 .../jaxrs/rx/server/ListAsyncSubscriber.java|  42 -
 .../rx/server/StreamingAsyncSubscriber.java | 124 -
 .../cxf/jaxrs/rx2/client/FlowableRxInvoker.java | 107 +++
 .../jaxrs/rx2/client/FlowableRxInvokerImpl.java | 180 +++
 .../rx2/client/FlowableRxInvokerProvider.java   |  45 +
 .../rx2/server/AbstractAsyncSubscriber.java |  65 +++
 .../cxf/jaxrs/rx2/server/FlowableInvoker.java   |  43 +
 .../server/JsonStreamingAsyncSubscriber.java|  34 
 .../rx2/server/StreamingAsyncSubscriber.java| 126 +
 .../reactive/JAXRSRxJava2FlowableTest.java  | 146 +++
 .../reactive/JAXRSRxJava2ObservableTest.java|  68 +++
 .../jaxrs/reactive/JAXRSRxJava2Test.java|  68 ---
 .../reactive/JAXRSRxJavaObservableTest.java |  83 +
 .../systest/jaxrs/reactive/JAXRSRxJavaTest.java | 141 ---
 .../jaxrs/reactive/RxJava2FlowableServer.java   |  79 
 .../jaxrs/reactive/RxJava2FlowableService.java  | 126 +
 .../jaxrs/reactive/RxJava2ObservableServer.java |  73 
 .../reactive/RxJava2ObservableService.java  |   3 +-
 .../systest/jaxrs/reactive/RxJava2Server.java   |  73 
 .../jaxrs/reactive/RxJavaObservableServer.java  |  79 
 .../jaxrs/reactive/RxJavaObservableService.java |  63 +--
 .../systest/jaxrs/reactive/RxJavaServer.java|  79 
 25 files changed, 1265 insertions(+), 688 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/253900af/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
index 60f7d20..0e5b90a 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
@@ -52,16 +52,16 @@ public class SwaggerUiResolver {
 return root;
 }
 }
-} else {
-Enumeration urls = 
cl.getResources(UI_RESOURCES_ROOT_START);
-while (urls.hasMoreElements()) {
-String urlStr = 
urls.nextElement().toString().replace(UI_RESOURCES_ROOT_START, ""); 
-String root = checkUiRoot(urlStr, 
swaggerUiMavenGroupAndArtifact, swaggerUiVersion);
-if (root != null) {
-return root;
-}
+}
+Enumeration urls = cl.getResources(UI_RESOURCES_ROOT_START);
+while (urls.hasMoreElements()) {
+String urlStr = 
urls.nextElement().toString().replace(UI_RESOURCES_ROOT_START, ""); 
+String root = checkUiRoot(urlStr, 
swaggerUiMavenGroupAndArtifact, swaggerUiVersion);
+if (root != null) {
+return root;
 }
 }
+
 } catch (Throwable ex) {
 // ignore
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/253900af/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/AbstractAsyncSubscriber.java
--
diff --git 
a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/AbstractAsyncSubscriber.java
 
b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/AbstractAsyncSubscriber.java
deleted file mode 100644
index 5e27454..000
--- 
a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/AbstractAsyncSubscriber.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * 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