date:20170810

cxf git commit: CXF-7085: Introduce support for Server Sent Events (Client). Multiple bugfixes and improvements

2017-08-10 Thread reta

Repository: cxf
Updated Branches:
  refs/heads/master b69bd4273 -> 85e9a4780


CXF-7085: Introduce support for Server Sent Events (Client). Multiple bugfixes 
and improvements


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

Branch: refs/heads/master
Commit: 85e9a478055cb35f917e5cfa8e19fa52a7290fe0
Parents: b69bd42
Author: reta 
Authored: Thu Aug 10 19:56:37 2017 -0400
Committer: reta 
Committed: Thu Aug 10 19:56:37 2017 -0400

--
 .../sse/client/InboundSseEventProcessor.java|  5 ++-
 .../jaxrs/sse/client/SseEventSourceImpl.java| 33 ++--
 .../AtmosphereSseServletDestination.java|  4 +++
 .../cxf/systest/jaxrs/sse/AbstractSseTest.java  | 17 +-
 .../apache/cxf/systest/jaxrs/sse/BookStore.java |  7 +
 .../cxf/systest/jaxrs/sse/BookStore2.java   |  7 +
 6 files changed, 62 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/85e9a478/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java
--
diff --git 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java
 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java
index 80a34cd..d105963 100644
--- 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java
+++ 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java
@@ -118,11 +118,14 @@ public class InboundSseEventProcessor {
 response.close();
 }
 
-closed = true;
 return null;
 };
 }
 
+boolean isClosed() {
+return closed;
+}
+
 boolean close(long timeout, TimeUnit unit) {
 try {
 closed = true;

http://git-wip-us.apache.org/repos/asf/cxf/blob/85e9a478/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
--
diff --git 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
index ad002c8..d8b22d4 100644
--- 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
+++ 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
@@ -28,6 +28,7 @@ import java.util.function.Consumer;
 import java.util.logging.Logger;
 
 import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Configuration;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedHashMap;
@@ -52,6 +53,7 @@ public class SseEventSourceImpl implements SseEventSource {
 
 // It may happen that open() and close() could be called on separate 
threads
 private volatile ScheduledExecutorService executor;
+private volatile boolean managedExecutor = true;
 private volatile InboundSseEventProcessor processor; 
 private volatile TimeUnit unit;
 private volatile long delay;
@@ -160,14 +162,18 @@ public class SseEventSourceImpl implements SseEventSource 
{
 }
 
 // Create the executor for scheduling the reconnect tasks 
-executor = 
-
(ScheduledExecutorService)target.getConfiguration().getProperty("scheduledExecutorService");
+final Configuration configuration = target.getConfiguration();
 if (executor == null) {
-executor = Executors.newSingleThreadScheduledExecutor();
+executor = (ScheduledExecutorService)configuration
+.getProperty("scheduledExecutorService");
+
+if (executor == null) {
+executor = Executors.newSingleThreadScheduledExecutor();
+managedExecutor = false; /* we manage lifecycle */
+}
 }
 
-
-final Object lastEventId = 
target.getConfiguration().getProperty(HttpHeaders.LAST_EVENT_ID_HEADER);
+final Object lastEventId = 
configuration.getProperty(HttpHeaders.LAST_EVENT_ID_HEADER);
 connect(lastEventId != null ? lastEventId.toString() : null);
 }
 
@@ -187,7 +193,7 @@ public class SseEventSourceImpl implements SseEventSource {
 .get();
 
 // A client can be told to stop reconnecting using the HTTP 204 No 
Content 
-// response code. In this case, we should stop here.
+// response code. In this case, we should give up.
 if (response.getStatus()

[2/4] cxf git commit: Remove a bunch of pointless "TODO Auto-generated method" comments

2017-08-10 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/5f277de6/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/GreeterSessionImpl.java
--
diff --git 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/GreeterSessionImpl.java
 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/GreeterSessionImpl.java
index 44f177b..0c262f9 100644
--- 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/GreeterSessionImpl.java
+++ 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/GreeterSessionImpl.java
@@ -96,13 +96,11 @@ public class GreeterSessionImpl implements Greeter {
 
 
 public Future greetMeAsync(String requestType, 
AsyncHandler asyncHandler) {
-// TODO Auto-generated method stub
 return null;
 }
 
 
 public Response greetMeAsync(String requestType) {
-// TODO Auto-generated method stub
 return null;
 }
 
@@ -129,25 +127,21 @@ public class GreeterSessionImpl implements Greeter {
 
 
 public Future pingMeAsync(AsyncHandler asyncHandler) {
-// TODO Auto-generated method stub
 return null;
 }
 
 
 public Response pingMeAsync() {
-// TODO Auto-generated method stub
 return null;
 }
 
 
 public Future sayHiAsync(AsyncHandler asyncHandler) {
-// TODO Auto-generated method stub
 return null;
 }
 
 
 public Response sayHiAsync() {
-// TODO Auto-generated method stub
 return null;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5f277de6/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/MapIdentityManager.java
--
diff --git 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/MapIdentityManager.java
 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/MapIdentityManager.java
index d4b74da..7352df1 100644
--- 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/MapIdentityManager.java
+++ 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/MapIdentityManager.java
@@ -63,7 +63,6 @@ class MapIdentityManager implements IdentityManager {
 
 @Override
 public Account verify(Credential credential) {
-// TODO Auto-generated method stub
 return null;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5f277de6/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/PerRequestAnnotationGreeterImpl.java
--
diff --git 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/PerRequestAnnotationGreeterImpl.java
 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/PerRequestAnnotationGreeterImpl.java
index e9d5d7a..fc6e3fc 100644
--- 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/PerRequestAnnotationGreeterImpl.java
+++ 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/PerRequestAnnotationGreeterImpl.java
@@ -55,43 +55,35 @@ public class PerRequestAnnotationGreeterImpl implements 
Greeter {
 
 
 public Future greetMeAsync(String requestType, 
AsyncHandler asyncHandler) {
-// TODO Auto-generated method stub
 return null;
 }
 
 
 public Response greetMeAsync(String requestType) {
-// TODO Auto-generated method stub
 return null;
 }
 
 
 public void greetMeOneWay(String requestType) {
-// TODO Auto-generated method stub
-
 }
 
 
 public Future pingMeAsync(AsyncHandler asyncHandler) {
-// TODO Auto-generated method stub
 return null;
 }
 
 
 public Response pingMeAsync() {
-// TODO Auto-generated method stub
 return null;
 }
 
 
 public Future sayHiAsync(AsyncHandler asyncHandler) {
-// TODO Auto-generated method stub
 return null;
 }
 
 
 public Response sayHiAsync() {
-// TODO Auto-generated method stub
 return null;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5f277de6/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/SessionAnnotationGreeterImpl.java
--
diff --git 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/SessionAnnotationGreeterImpl.java
 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/SessionAnnotationGreeterImpl.java
index 02ed1c5..6cbc252 100644
--- 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/SessionAnnotationGreeterImpl.java
+++

[4/4] cxf git commit: Start going through the "TODO Auto-generated catch block"'s to figure out what should be done

2017-08-10 Thread dkulp

Start going through the "TODO Auto-generated catch block"'s to figure out what 
should be done


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

Branch: refs/heads/master
Commit: b69bd427318a9f6db6e6e7940796cb233aa54ef9
Parents: 5f277de
Author: Daniel Kulp 
Authored: Thu Aug 10 14:07:48 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Aug 10 14:07:48 2017 -0400

--
 .../apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java  | 3 +--
 .../src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java | 4 +---
 .../cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java   | 1 -
 .../cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java | 4 
 .../src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java  | 2 +-
 .../cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java | 1 -
 .../apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java | 1 -
 7 files changed, 3 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b69bd427/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
index df4f605..7d32846 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
@@ -284,8 +284,7 @@ public class AnnotationHandlerChainBuilder extends 
HandlerChainBuilder {
 PortComponentHandlerType pt = JAXBUtils.unmarshall(ctx, el, 
PortComponentHandlerType.class).getValue();
 chain.addAll(buildHandlerChain(pt, classLoader));
 } catch (JAXBException e) {
-// TODO Auto-generated catch block
-e.printStackTrace();
+throw new IllegalArgumentException("Could not unmarshal handler 
chain", e);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b69bd427/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
index 3b91b72..e9691cf 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
@@ -203,12 +203,10 @@ public class ProviderImpl extends 
javax.xml.ws.spi.Provider {
 um = context.createUnmarshaller();
 return um.unmarshal(reader, 
EndpointReferenceType.class).getValue();
 } catch (JAXBException e) {
-// TODO Auto-generated catch block
-e.printStackTrace();
+throw new IllegalArgumentException("Could not unmarshal 
EndpointReference", e);
 } finally {
 JAXBUtils.closeUnmarshaller(um);
 }
-return null;
 }
 return null;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/b69bd427/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java
--
diff --git 
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java
 
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java
index 0f0da70..5787c5f 100644
--- 
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java
+++ 
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java
@@ -47,7 +47,6 @@ public class MtoMParameterBeanNoDataHandler {
 try {
 this.notXml10 = new String(notXml10, "utf-8");
 } catch (UnsupportedEncodingException e) {
-// TODO Auto-generated catch block
 e.printStackTrace();
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/b69bd427/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
--
diff --git

[3/4] cxf git commit: Remove a bunch of pointless "TODO Auto-generated method" comments

2017-08-10 Thread dkulp

Remove a bunch of pointless "TODO Auto-generated method" comments


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

Branch: refs/heads/master
Commit: 5f277de68568c7e3df68c2f5f40a09faf353192f
Parents: baf0980
Author: Daniel Kulp 
Authored: Thu Aug 10 14:00:07 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Aug 10 14:00:07 2017 -0400

--
 .../cxf/bus/managers/ServerRegistryImpl.java|  2 -
 .../catalog/CatalogXmlSchemaURIResolver.java|  2 +-
 .../org/apache/cxf/common/jaxb/JAXBUtils.java   |  2 -
 .../apache/cxf/common/util/Base64Exception.java |  3 --
 .../cxf/databinding/source/NodeDataReader.java  |  6 ---
 .../interceptor/MessageSenderInterceptor.java   |  2 +-
 .../interceptor/OutgoingChainInterceptor.java   | 11 +++--
 .../cxf/staxutils/AbstractDOMStreamReader.java  |  2 -
 .../org/apache/cxf/endpoint/DummyServer.java|  2 -
 .../org/apache/cxf/jca/cxf/test/DummyBus.java   |  7 ---
 .../corba/runtime/CorbaStreamReader.java| 24 --
 .../cxf/binding/corba/utils/CorbaAnyHelper.java |  1 -
 .../cxf/aegis/util/stax/JDOMStreamWriter.java   |  1 -
 .../java/org/apache/cxf/jaxrs/Customer.java |  2 -
 .../apache/cxf/jaxrs/JAXBContextProvider.java   |  1 -
 .../apache/cxf/jaxrs/JAXBContextProvider2.java  |  1 -
 .../cxf/jaxrs/JAXRSServerFactoryBeanTest.java   |  2 -
 .../cxf/jaxrs/ext/MessageContextImplTest.java   |  1 -
 .../cxf/jaxrs/impl/ConfigurationImplTest.java   |  1 -
 .../jaxrs/provider/JAXBElementProviderTest.java | 46 ++--
 .../cxf/jaxrs/provider/ProviderFactoryTest.java | 17 
 .../apache/cxf/jaxrs/resources/BookStore.java   |  2 -
 .../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java  |  4 --
 .../interceptors/MessageModeOutInterceptor.java |  1 -
 .../cxf/jaxws/ConfiguredEndpointTest.java   |  1 -
 .../jaxws/handler/HandlerChainInvokerTest.java  |  2 -
 .../cxf/jaxws/service/FooServiceImpl.java   |  1 -
 .../org/apache/cxf/jaxws/service/Hello2.java|  3 --
 .../org/apache/cxf/jaxws/service/Hello3.java|  3 --
 .../cxf/service/factory/ServerFactoryTest.java  |  5 ---
 .../apache/cxf/jaxrs/client/WebClientTest.java  |  1 -
 .../apache/cxf/jaxrs/resources/BookStore.java   |  2 -
 .../oauth2/grants/OAuthDataProviderImpl.java|  7 ---
 .../crypto/CodeGrantEncryptingDataProvider.java |  1 -
 .../utils/crypto/EncryptingDataProvider.java|  2 -
 .../saml/sso/state/HTTPSPStateManager.java  |  2 -
 .../http/netty/client/NettyHttpConduit.java |  3 --
 .../jetty/WebSocketVirtualServletRequest.java   |  9 
 .../jetty9/Jetty9WebSocketDestination.java  |  1 -
 .../WebSocketUndertowServletRequest.java|  9 
 .../org/apache/cxf/ws/policy/TestAssertion.java |  1 -
 .../cxf/ws/rm/soap/RedeliveryQueueImpl.java |  1 -
 .../apache/cxf/ws/rm/ManagedRMManagerTest.java  |  5 ---
 .../cxf/ws/rm/RMManagerConfigurationTest.java   | 26 +++
 .../apache/cxf/wsdl/JAXBExtensionHelper.java|  1 -
 .../apache/cxf/systest/source/GreeterImpl.java  |  2 -
 .../systest/source/PutLastTradePriceImpl.java   |  4 --
 .../apache/cxf/systest/jaxrs/BookServer.java|  2 -
 .../cxf/systest/jaxrs/CustomResponse.java   | 22 --
 .../jaxrs/JAXRS20ClientServerBookTest.java  |  2 -
 .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java |  2 -
 .../cxf/systest/jaxws/ClientServerTest.java |  1 -
 .../jaxws/cxf5064/SOAPHeaderServiceImpl.java|  1 -
 .../apache/cxf/systest/jaxws/types/BarImpl.java |  1 -
 .../provider/HWDOMSourcePayloadProvider.java|  1 -
 .../cxf/systest/jms/TwoWayJMSImplBase.java  |  6 ---
 .../systest/jms/security/TwoWayJMSImplBase.java |  6 ---
 .../http_undertow/GreeterSessionImpl.java   |  6 ---
 .../http_undertow/MapIdentityManager.java   |  1 -
 .../PerRequestAnnotationGreeterImpl.java|  8 
 .../SessionAnnotationGreeterImpl.java   |  8 
 .../SpringAnnotationGreeterImpl.java|  8 
 .../http_undertow/StatefulGreeterImpl.java  |  7 ---
 .../cxf/systest/http/GreeterSessionImpl.java|  6 ---
 .../http/PerRequestAnnotationGreeterImpl.java   |  8 
 .../http/SessionAnnotationGreeterImpl.java  |  7 ---
 .../http/SpringAnnotationGreeterImpl.java   |  8 
 .../cxf/systest/http/StatefulGreeterImpl.java   |  7 ---
 .../cxf/systest/http/auth/GreeterImpl.java  |  3 --
 .../DummyPlatformTransactionManager.java|  3 --
 .../cxf/systest/clustering/ControlImpl.java |  5 ---
 .../cxf/systest/mtom/TestMtomJMSImpl.java   |  1 -
 .../schema_validation/SchemaValidationImpl.java |  1 -
 .../cxf/systest/ws/rm/MessageLossSimulator.java |  1 -
 .../greeter_control/AbstractGreeterImpl.java|  7 ---

[1/4] cxf git commit: Don't use deprecated method of configuration

2017-08-10 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/master ff2a2793e -> b69bd4273


Don't use deprecated method of configuration


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

Branch: refs/heads/master
Commit: baf0980cfaed32f5b69d87c0c727cde7fadd4159
Parents: ff2a279
Author: Daniel Kulp 
Authored: Thu Aug 10 13:38:44 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Aug 10 13:38:44 2017 -0400

--
 .../apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java| 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/baf0980c/maven-plugins/java2swagger-plugin/src/main/java/org/apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java
--
diff --git 
a/maven-plugins/java2swagger-plugin/src/main/java/org/apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java
 
b/maven-plugins/java2swagger-plugin/src/main/java/org/apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java
index a585366..6972907 100644
--- 
a/maven-plugins/java2swagger-plugin/src/main/java/org/apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java
+++ 
b/maven-plugins/java2swagger-plugin/src/main/java/org/apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java
@@ -34,7 +34,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.SerializationFeature;
 
 import org.apache.cxf.helpers.FileUtils;
 import org.apache.maven.plugin.AbstractMojo;
@@ -286,8 +285,8 @@ public class Java2SwaggerMojo extends AbstractMojo {
 
 private void configureSwagger() {
 swagger = new Swagger();
-mapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false);
 mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
 Info info = new Info();
 Contact swaggerContact = new Contact();
 License swaggerLicense = new License();

cxf-fediz git commit: Removing accidental commit

2017-08-10 Thread coheigea

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.4.x-fixes 6d4e960ac -> 5e5cb9bbe


Removing accidental commit


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

Branch: refs/heads/1.4.x-fixes
Commit: 5e5cb9bbe9609cdf0d2aace61a9b1505d41e3d44
Parents: 6d4e960
Author: Colm O hEigeartaigh 
Authored: Thu Aug 10 17:43:29 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Aug 10 17:44:00 2017 +0100

--
 .../fediz/tomcat8/FederationAuthenticator.java  | 47 +---
 1 file changed, 20 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5e5cb9bb/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
--
diff --git 
a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
 
b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
index 9981997..e3da1db 100644
--- 
a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
+++ 
b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
@@ -374,20 +374,8 @@ public class FederationAuthenticator extends 
FormAuthenticator {
 protected boolean checkUserAuthentication(Request request, 
HttpServletResponse response, FedizContext fedCtx) {
 // Have we already authenticated someone?
 Principal principal = request.getUserPrincipal();
-Session session = request.getSessionInternal();
 // String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
-if (principal != null && session != null) {
-if (!session.isValid()) {
-// Session has expired
-LOG.warn("Session has expired. Clean up and redirect");
-
-session.removeNote(FEDERATION_NOTE);
-session.setPrincipal(null);
-request.getSession().removeAttribute(SECURITY_TOKEN);
-
-return false;
-}
-
+if (principal != null) {
 LOG.debug("Already authenticated '{}'", principal.getName());
 
 // Associate the session with any existing SSO session
@@ -408,23 +396,28 @@ public class FederationAuthenticator extends 
FormAuthenticator {
 
 protected boolean validateToken(Request request, HttpServletResponse 
response, FedizContext fedConfig) {
 Session session = request.getSessionInternal();
-FedizResponse wfRes = (FedizResponse)session.getNote(FEDERATION_NOTE);
-Date tokenExpires = wfRes.getTokenExpires();
-if (tokenExpires == null) {
-LOG.debug("Token doesn't expire");
-return true;
-}
+if (session != null) {
 
-Date currentTime = new Date();
-if (!currentTime.after(tokenExpires)) {
-return true;
-}
+FedizResponse wfRes = 
(FedizResponse)session.getNote(FEDERATION_NOTE);
+Date tokenExpires = wfRes.getTokenExpires();
+if (tokenExpires == null) {
+LOG.debug("Token doesn't expire");
+return true;
+}
 
-LOG.warn("Token already expired. Clean up and redirect");
+Date currentTime = new Date();
+if (!currentTime.after(tokenExpires)) {
+return true;
+} else {
+LOG.warn("Token already expired. Clean up and redirect");
 
-session.removeNote(FEDERATION_NOTE);
-session.setPrincipal(null);
-request.getSession().removeAttribute(SECURITY_TOKEN);
+session.removeNote(FEDERATION_NOTE);
+session.setPrincipal(null);
+request.getSession().removeAttribute(SECURITY_TOKEN);
+}
+} else {
+LOG.debug("Session should not be null after authentication");
+}
 return false;
 }

cxf-fediz git commit: Removing accidental commit

2017-08-10 Thread coheigea

Repository: cxf-fediz
Updated Branches:
  refs/heads/master fe5f187b8 -> 613852a99


Removing accidental commit


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

Branch: refs/heads/master
Commit: 613852a995f3c3905dab492b356109b9682c3445
Parents: fe5f187
Author: Colm O hEigeartaigh 
Authored: Thu Aug 10 17:43:29 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Aug 10 17:43:29 2017 +0100

--
 .../fediz/tomcat8/FederationAuthenticator.java  | 47 +---
 1 file changed, 20 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/613852a9/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
--
diff --git 
a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
 
b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
index 9981997..e3da1db 100644
--- 
a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
+++ 
b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
@@ -374,20 +374,8 @@ public class FederationAuthenticator extends 
FormAuthenticator {
 protected boolean checkUserAuthentication(Request request, 
HttpServletResponse response, FedizContext fedCtx) {
 // Have we already authenticated someone?
 Principal principal = request.getUserPrincipal();
-Session session = request.getSessionInternal();
 // String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
-if (principal != null && session != null) {
-if (!session.isValid()) {
-// Session has expired
-LOG.warn("Session has expired. Clean up and redirect");
-
-session.removeNote(FEDERATION_NOTE);
-session.setPrincipal(null);
-request.getSession().removeAttribute(SECURITY_TOKEN);
-
-return false;
-}
-
+if (principal != null) {
 LOG.debug("Already authenticated '{}'", principal.getName());
 
 // Associate the session with any existing SSO session
@@ -408,23 +396,28 @@ public class FederationAuthenticator extends 
FormAuthenticator {
 
 protected boolean validateToken(Request request, HttpServletResponse 
response, FedizContext fedConfig) {
 Session session = request.getSessionInternal();
-FedizResponse wfRes = (FedizResponse)session.getNote(FEDERATION_NOTE);
-Date tokenExpires = wfRes.getTokenExpires();
-if (tokenExpires == null) {
-LOG.debug("Token doesn't expire");
-return true;
-}
+if (session != null) {
 
-Date currentTime = new Date();
-if (!currentTime.after(tokenExpires)) {
-return true;
-}
+FedizResponse wfRes = 
(FedizResponse)session.getNote(FEDERATION_NOTE);
+Date tokenExpires = wfRes.getTokenExpires();
+if (tokenExpires == null) {
+LOG.debug("Token doesn't expire");
+return true;
+}
 
-LOG.warn("Token already expired. Clean up and redirect");
+Date currentTime = new Date();
+if (!currentTime.after(tokenExpires)) {
+return true;
+} else {
+LOG.warn("Token already expired. Clean up and redirect");
 
-session.removeNote(FEDERATION_NOTE);
-session.setPrincipal(null);
-request.getSession().removeAttribute(SECURITY_TOKEN);
+session.removeNote(FEDERATION_NOTE);
+session.setPrincipal(null);
+request.getSession().removeAttribute(SECURITY_TOKEN);
+}
+} else {
+LOG.debug("Session should not be null after authentication");
+}
 return false;
 }

[5/8] cxf git commit: Fix a bunch more warnings

2017-08-10 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
index df86a11..06d6d82 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
@@ -66,6 +66,7 @@ import 
org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.stax.ext.OutboundSecurityContext;
 import org.apache.xml.security.stax.ext.SecurePart;
 import org.apache.xml.security.stax.ext.SecurePart.Modifier;
+import org.apache.xml.security.stax.ext.XMLSecurityConstants;
 import org.apache.xml.security.stax.impl.util.IDGenerator;
 import 
org.apache.xml.security.stax.securityEvent.AbstractSecuredElementSecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
@@ -235,7 +236,7 @@ public class StaxSymmetricBindingHandler extends 
AbstractStaxBindingHandler {
 //Check for signature protection
 if (sbinding.isEncryptSignature()) {
 SecurePart part =
-new SecurePart(new QName(WSSConstants.NS_DSIG, 
"Signature"), Modifier.Element);
+new SecurePart(new QName(XMLSecurityConstants.NS_DSIG, 
"Signature"), Modifier.Element);
 encrParts.add(part);
 if (signatureConfirmationAdded) {
 part = new 
SecurePart(WSSConstants.TAG_WSSE11_SIG_CONF, Modifier.Element);
@@ -373,7 +374,7 @@ public class StaxSymmetricBindingHandler extends 
AbstractStaxBindingHandler {
 //Check for signature protection
 if (sbinding.isEncryptSignature()) {
 SecurePart part =
-new SecurePart(new QName(WSSConstants.NS_DSIG, 
"Signature"), Modifier.Element);
+new SecurePart(new QName(XMLSecurityConstants.NS_DSIG, 
"Signature"), Modifier.Element);
 enc.add(part);
 if (signatureConfirmationAdded) {
 part = new SecurePart(WSSConstants.TAG_WSSE11_SIG_CONF, 
Modifier.Element);
@@ -406,7 +407,7 @@ public class StaxSymmetricBindingHandler extends 
AbstractStaxBindingHandler {
 
 // Action
 WSSSecurityProperties properties = getProperties();
-WSSConstants.Action actionToPerform = WSSConstants.ENCRYPT;
+WSSConstants.Action actionToPerform = XMLSecurityConstants.ENCRYPT;
 if (recToken.getToken().getDerivedKeys() == 
DerivedKeys.RequireDerivedKeys) {
 actionToPerform = WSSConstants.ENCRYPT_WITH_DERIVED_KEY;
 if (MessageUtils.isRequestor(message) && recToken.getToken() 
instanceof X509Token) {
@@ -506,7 +507,7 @@ public class StaxSymmetricBindingHandler extends 
AbstractStaxBindingHandler {
 
 // Action
 WSSSecurityProperties properties = getProperties();
-WSSConstants.Action actionToPerform = WSSConstants.SIGNATURE;
+WSSConstants.Action actionToPerform = XMLSecurityConstants.SIGNATURE;
 if (wrapper.getToken().getDerivedKeys() == 
DerivedKeys.RequireDerivedKeys) {
 actionToPerform = WSSConstants.SIGNATURE_WITH_DERIVED_KEY;
 if (MessageUtils.isRequestor(message) && policyToken instanceof 
X509Token) {
@@ -545,7 +546,7 @@ public class StaxSymmetricBindingHandler extends 
AbstractStaxBindingHandler {
 AbstractToken sigToken = wrapper.getToken();
 if (sbinding.isProtectTokens() && sigToken instanceof X509Token && 
isRequestor()) {
 SecurePart securePart =
-new SecurePart(new QName(WSSConstants.NS_XMLENC, 
"EncryptedKey"), Modifier.Element);
+new SecurePart(new QName(XMLSecurityConstants.NS_XMLENC, 
"EncryptedKey"), Modifier.Element);
 properties.addSignaturePart(securePart);
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
index ff71d2f..5ea70ad 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
+++

[8/8] cxf git commit: Add some NPE checks

2017-08-10 Thread dkulp

Add some NPE checks


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

Branch: refs/heads/master
Commit: ff2a2793ea253a1cd45ea30507cbfc87b879fcf8
Parents: dd2ef49
Author: Daniel Kulp 
Authored: Thu Aug 10 12:29:56 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Aug 10 12:29:56 2017 -0400

--
 .../apache/cxf/staxutils/transform/InTransformReader.java   | 2 +-
 .../apache/cxf/staxutils/transform/OutTransformWriter.java  | 2 +-
 .../org/apache/cxf/ws/addressing/VersionTransformer.java| 4 ++--
 .../cxf/jca/core/resourceadapter/UriHandlerInitTest.java| 9 +
 4 files changed, 5 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ff2a2793/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java 
b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
index efd74b3..aee34fd 100644
--- 
a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
+++ 
b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
@@ -139,7 +139,7 @@ public class InTransformReader extends DepthXMLStreamReader 
{
 if (null != appendProp && !replaceContent) {
 // handle one of the four append modes
 handleAppendMode(expected, appendProp);
-} else if (replaceContent) {
+} else if (null != appendProp && replaceContent) {
 replaceText = appendProp.getText();
 if (doDebug) {
 LOG.fine("replacing content with " + replaceText);

http://git-wip-us.apache.org/repos/asf/cxf/blob/ff2a2793/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java 
b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
index a29a59d..ec7fa8c 100644
--- 
a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
+++ 
b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
@@ -242,7 +242,7 @@ public class OutTransformWriter extends 
DelegatingXMLStreamWriter {
 super.writeEndElement();
 }
 }
-} else if (replaceContent) {
+} else if (null != appendProp && replaceContent) {
 //
 replaceText = appendProp.getText();
 } else if (dropped) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/ff2a2793/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java 
b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
index 77ec674..1fdca0b 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
@@ -184,7 +184,7 @@ public class VersionTransformer {
 exposed.setServiceName(serviceName);
 }
 String portLocalName = EndpointReferenceUtils.getPortName(internal);
-if (portLocalName != null) {
+if (portLocalName != null && serviceQName != null) {
 String namespace = serviceQName.getNamespaceURI() != null
? serviceQName.getNamespaceURI()
: Names.WSDL_INSTANCE_NAMESPACE_NAME;
@@ -221,7 +221,7 @@ public class VersionTransformer {
 exposed.setServiceName(serviceName);
 }
 String portLocalName = EndpointReferenceUtils.getPortName(internal);
-if (portLocalName != null) {
+if (portLocalName != null && serviceQName != null) {
 String namespace = serviceQName.getNamespaceURI() != null
 ? serviceQName.getNamespaceURI() : 
Names.WSDL_INSTANCE_NAMESPACE_NAME;
 QName portQName = new QName(namespace, portLocalName);

http://git-wip-us.apache.org/repos/asf/cxf/blob/ff2a2793/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
--
diff --git 
a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java

[1/8] cxf git commit: Fix a bunch more warnings

2017-08-10 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/master c6ec59987 -> ff2a2793e


http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
--
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index 0d5af95..ed4069c 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -60,13 +60,13 @@ import org.apache.cxf.sts.token.provider.TokenProvider;
 import org.apache.cxf.sts.token.provider.TokenProviderParameters;
 import org.apache.cxf.sts.token.provider.TokenProviderResponse;
 import org.apache.cxf.ws.security.tokenstore.TokenStore;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 import org.apache.wss4j.common.util.DateUtil;
-import org.apache.wss4j.dom.WSConstants;
 import org.junit.BeforeClass;
 
 
@@ -95,7 +95,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
 Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
 CallbackHandler callbackHandler = new PasswordCallbackHandler();
 Element samlToken =
-createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
+createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
 Document doc = samlToken.getOwnerDocument();
 samlToken = (Element)doc.appendChild(samlToken);
 
@@ -128,7 +128,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
 Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
 CallbackHandler callbackHandler = new PasswordCallbackHandler();
 Element samlToken =
-createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
+createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
 Document doc = samlToken.getOwnerDocument();
 samlToken = (Element)doc.appendChild(samlToken);
 
@@ -165,7 +165,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
 CallbackHandler callbackHandler = new PasswordCallbackHandler();
 Element samlToken =
 createSAMLAssertionWithClaimsProvider(
-WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", 
callbackHandler
+WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", 
callbackHandler
 );
 Document doc = samlToken.getOwnerDocument();
 samlToken = (Element)doc.appendChild(samlToken);
@@ -196,7 +196,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
 Crypto crypto = CryptoFactory.getInstance(getEveCryptoProperties());
 CallbackHandler callbackHandler = new EveCallbackHandler();
 Element samlToken =
-createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"eve", callbackHandler);
+createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"eve", callbackHandler);
 Document doc = samlToken.getOwnerDocument();
 samlToken = (Element)doc.appendChild(samlToken);
 
@@ -229,7 +229,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
 Crypto crypto = CryptoFactory.getInstance(getEveCryptoProperties());
 CallbackHandler callbackHandler = new EveCallbackHandler();
 Element samlToken =
-createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"eve", callbackHandler);
+createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"eve", callbackHandler);
 Document doc = samlToken.getOwnerDocument();
 samlToken = (Element)doc.appendChild(samlToken);
 
@@ -263,7 +263,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
 Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
 CallbackHandler callbackHandler = new PasswordCallbackHandler();
 Element samlToken =
-createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler, 50);
+createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler, 50);
 Document doc = samlToken.getOwnerDocument();
 samlToken = (Element)doc.appendChild(samlToken);
 
@@ -293,7 +293,7 @@ public class

[3/8] cxf git commit: Fix a bunch more warnings

2017-08-10 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
--
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
index 256dbb3..4811c7c 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
@@ -78,6 +78,7 @@ import 
org.apache.cxf.ws.security.sts.provider.model.RequestedSecurityTokenType;
 import org.apache.cxf.ws.security.sts.provider.model.secext.AttributedString;
 import org.apache.cxf.ws.security.sts.provider.model.secext.PasswordString;
 import org.apache.cxf.ws.security.sts.provider.model.secext.UsernameTokenType;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
@@ -86,7 +87,6 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.DOM2Writer;
-import org.apache.wss4j.dom.WSConstants;
 
 /**
  * Some unit tests for the issue operation.
@@ -136,14 +136,14 @@ public class IssueOnbehalfofUnitTest extends 
org.junit.Assert {
 RequestSecurityTokenType request = new RequestSecurityTokenType();
 JAXBElement tokenType =
 new JAXBElement(
-QNameConstants.TOKEN_TYPE, String.class, 
WSConstants.WSS_SAML2_TOKEN_TYPE
+QNameConstants.TOKEN_TYPE, String.class, 
WSS4JConstants.WSS_SAML2_TOKEN_TYPE
 );
 request.getAny().add(tokenType);
 
 // Get a SAML Token via the SAMLTokenProvider
 CallbackHandler callbackHandler = new PasswordCallbackHandler();
 Element samlToken =
-createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
+createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
 Document doc = samlToken.getOwnerDocument();
 samlToken = (Element)doc.appendChild(samlToken);
 OnBehalfOfType onbehalfof = new OnBehalfOfType();
@@ -207,14 +207,14 @@ public class IssueOnbehalfofUnitTest extends 
org.junit.Assert {
 RequestSecurityTokenType request = new RequestSecurityTokenType();
 JAXBElement tokenType =
 new JAXBElement(
-QNameConstants.TOKEN_TYPE, String.class, 
WSConstants.WSS_SAML2_TOKEN_TYPE
+QNameConstants.TOKEN_TYPE, String.class, 
WSS4JConstants.WSS_SAML2_TOKEN_TYPE
 );
 request.getAny().add(tokenType);
 
 // Get a SAML Token via the SAMLTokenProvider
 CallbackHandler callbackHandler = new PasswordCallbackHandler();
 Element samlToken =
-createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
+createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
 Document doc = samlToken.getOwnerDocument();
 samlToken = (Element)doc.appendChild(samlToken);
 OnBehalfOfType onbehalfof = new OnBehalfOfType();
@@ -275,14 +275,14 @@ public class IssueOnbehalfofUnitTest extends 
org.junit.Assert {
 RequestSecurityTokenType request = new RequestSecurityTokenType();
 JAXBElement tokenType =
 new JAXBElement(
-QNameConstants.TOKEN_TYPE, String.class, 
WSConstants.WSS_SAML2_TOKEN_TYPE
+QNameConstants.TOKEN_TYPE, String.class, 
WSS4JConstants.WSS_SAML2_TOKEN_TYPE
 );
 request.getAny().add(tokenType);
 
 // Get a SAML Token via the SAMLTokenProvider
 CallbackHandler callbackHandler = new PasswordCallbackHandler();
 Element samlToken =
-createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey",
+createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey",
 callbackHandler, null, 
STSConstants.SYMMETRIC_KEY_TYPE);
 Document doc = samlToken.getOwnerDocument();
 samlToken = (Element)doc.appendChild(samlToken);
@@ -356,14 +356,14 @@ public class IssueOnbehalfofUnitTest extends 
org.junit.Assert {
 RequestSecurityTokenType request = new RequestSecurityTokenType();
 JAXBElement tokenType =
 new JAXBElement(
-QNameConstants.TOKEN_TYPE, String.class, 
WSConstants.WSS_SAML2_TOKEN_TYPE
+QNameConstants.TOKEN_TYPE, String.class,

[2/8] cxf git commit: Fix a bunch more warnings

2017-08-10 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
--
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
index 1e6a21e..b2cf53b 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
@@ -43,6 +43,7 @@ import org.apache.cxf.sts.common.PasswordCallbackHandler;
 import org.apache.cxf.sts.request.KeyRequirements;
 import org.apache.cxf.sts.request.TokenRequirements;
 import org.apache.cxf.sts.service.EncryptionProperties;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.ext.WSSecurityException;
@@ -50,7 +51,6 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.DOM2Writer;
-import org.apache.wss4j.dom.WSConstants;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.saml2.core.Attribute;
 
@@ -78,7 +78,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
 public void testSaml2Claims() throws Exception {
 TokenProvider samlTokenProvider = new SAMLTokenProvider();
 TokenProviderParameters providerParameters =
-createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE, null);
+createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE, null);
 
 ClaimsManager claimsManager = new ClaimsManager();
 ClaimsHandler claimsHandler = new CustomClaimsHandler();
@@ -88,7 +88,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
 ClaimCollection claims = createClaims();
 providerParameters.setRequestedPrimaryClaims(claims);
 
-
assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE));
+
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
 TokenProviderResponse providerResponse = 
samlTokenProvider.createToken(providerParameters);
 assertTrue(providerResponse != null);
 assertTrue(providerResponse.getToken() != null && 
providerResponse.getTokenId() != null);
@@ -113,7 +113,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
 public void testSaml2MultipleClaims() throws Exception {
 TokenProvider samlTokenProvider = new SAMLTokenProvider();
 TokenProviderParameters providerParameters =
-createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE, null);
+createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE, null);
 
 ClaimsManager claimsManager = new ClaimsManager();
 ClaimsHandler claimsHandler = new CustomClaimsHandler();
@@ -129,7 +129,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
 secondaryClaims.add(claim);
 providerParameters.setRequestedSecondaryClaims(secondaryClaims);
 
-
assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE));
+
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
 TokenProviderResponse providerResponse = 
samlTokenProvider.createToken(providerParameters);
 assertTrue(providerResponse != null);
 assertTrue(providerResponse.getToken() != null && 
providerResponse.getTokenId() != null);
@@ -156,7 +156,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
 public void testSaml2MultipleClaimsSameDialect() throws Exception {
 TokenProvider samlTokenProvider = new SAMLTokenProvider();
 TokenProviderParameters providerParameters =
-createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE, null);
+createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE, null);
 
 ClaimsManager claimsManager = new ClaimsManager();
 ClaimsHandler claimsHandler = new CustomClaimsHandler();
@@ -174,7 +174,7 @@ public class SAMLClaimsTest extends org.junit.Assert {
 secondaryClaims.setDialect(ClaimTypes.URI_BASE);
 providerParameters.setRequestedSecondaryClaims(secondaryClaims);
 
-
assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE));
+
assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE));
 TokenProviderResponse providerResponse =

[7/8] cxf git commit: Use commons-text since the escape stuff in commons-lang is deprecated and no longer maintained

2017-08-10 Thread dkulp

Use commons-text since the escape stuff in commons-lang is deprecated and no 
longer maintained


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

Branch: refs/heads/master
Commit: dd2ef496df36ef8967b5274c0a5928f5594469be
Parents: f0797a5
Author: Daniel Kulp 
Authored: Thu Aug 10 11:48:23 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Aug 10 11:48:23 2017 -0400

--
 osgi/karaf/features/src/main/resources/features.xml| 1 +
 parent/pom.xml | 6 ++
 tools/wsdlto/frontend/jaxws/pom.xml| 4 
 .../frontend/jaxws/customization/JAXWSBindingParser.java   | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/dd2ef496/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 5c55c09..01f9487 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -404,6 +404,7 @@
 cxf-jaxws
 cxf-javascript
 mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}
+mvn:org.apache.commons/commons-text/${cxf.commons-text.version}
 wrap:mvn:org.apache.velocity/velocity-engine-core/${cxf.velocity.version}
 mvn:commons-collections/commons-collections/${cxf.commons-collections.version}
 mvn:org.apache.cxf/cxf-tools-common/${project.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/dd2ef496/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5755f9d..f0c1e56 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -81,6 +81,7 @@
 1.10
 
3.2.2
 3.6
+1.1
 10.13.1.1
 3.2.0
 2.10.3
@@ -1714,6 +1715,11 @@
 ${cxf.commons-lang3.version}
 
 
+org.apache.commons
+commons-text
+${cxf.commons-text.version}
+
+
 org.bouncycastle
 bcprov-jdk15on
 ${cxf.bcprov.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/dd2ef496/tools/wsdlto/frontend/jaxws/pom.xml
--
diff --git a/tools/wsdlto/frontend/jaxws/pom.xml 
b/tools/wsdlto/frontend/jaxws/pom.xml
index 364d057..312950b 100644
--- a/tools/wsdlto/frontend/jaxws/pom.xml
+++ b/tools/wsdlto/frontend/jaxws/pom.xml
@@ -55,5 +55,9 @@
 cxf-tools-wsdlto-core
 ${project.version}
 
+
+org.apache.commons
+commons-text
+
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/dd2ef496/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
--
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
index aafe2a2..adb4421 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;

[6/8] cxf git commit: Fix a bunch more warnings

2017-08-10 Thread dkulp

Fix a bunch more warnings


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

Branch: refs/heads/master
Commit: f0797a552381467b1e10cba019c4a556e3734db1
Parents: c6ec599
Author: Daniel Kulp 
Authored: Wed Aug 9 18:07:04 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Aug 10 11:17:55 2017 -0400

--
 .../policy/custom/AlgorithmSuiteBuilder.java|   4 +-
 .../policy/interceptors/STSInvoker.java |   8 +-
 .../SecureConversationOutInterceptor.java   |   4 +-
 .../SpnegoContextTokenInInterceptor.java|  12 +--
 .../ws/security/tokenstore/SecurityToken.java   |  12 +--
 .../ws/security/trust/AbstractSTSClient.java|  32 +++---
 .../security/trust/DefaultSTSTokenCacher.java   |  18 ++--
 .../cxf/ws/security/trust/STSLoginModule.java   |   4 +-
 .../wss4j/AbstractTokenInterceptor.java |  11 +-
 .../wss4j/AbstractWSS4JInterceptor.java |   8 +-
 .../wss4j/AbstractWSS4JStaxInterceptor.java |   3 +-
 .../wss4j/AlgorithmSuiteTranslater.java |  10 +-
 .../wss4j/BinarySecurityTokenInterceptor.java   |   5 +-
 .../security/wss4j/CryptoCoverageChecker.java   |   4 +-
 .../ws/security/wss4j/CryptoCoverageUtil.java   |  16 +--
 .../ws/security/wss4j/SamlTokenInterceptor.java |   5 +-
 .../security/wss4j/StaxActionInInterceptor.java |   4 +-
 .../wss4j/UsernameTokenInterceptor.java |   7 +-
 .../security/wss4j/WSS4JStaxInInterceptor.java  |   3 +-
 .../policyhandlers/AbstractBindingBuilder.java  | 103 ++-
 .../AbstractStaxBindingHandler.java |  27 ++---
 .../AsymmetricBindingHandler.java   |  31 +++---
 .../StaxAsymmetricBindingHandler.java   |  13 +--
 .../StaxSymmetricBindingHandler.java|  11 +-
 .../StaxTransportBindingHandler.java|   5 +-
 .../policyhandlers/SymmetricBindingHandler.java |  79 +++---
 .../policyhandlers/TransportBindingHandler.java |  21 ++--
 .../AbstractSupportingTokenPolicyValidator.java |   3 +-
 .../AlgorithmSuitePolicyValidator.java  |   7 +-
 .../IssuedTokenPolicyValidator.java |   9 +-
 .../X509TokenPolicyValidator.java   |   7 +-
 .../ws/security/wss4j/AbstractSecurityTest.java |  16 +--
 .../security/wss4j/DOMToStaxRoundTripTest.java  |  14 +--
 .../wss4j/StaxCryptoCoverageCheckerTest.java|  22 ++--
 .../security/wss4j/StaxRoundTripActionTest.java |  48 -
 .../ws/security/wss4j/StaxRoundTripTest.java|  34 +++---
 .../StaxToDOMEncryptionIdentifierTest.java  |  22 ++--
 .../security/wss4j/StaxToDOMRoundTripTest.java  |  56 +-
 .../wss4j/StaxToDOMSignatureIdentifierTest.java |  12 ++-
 .../wss4j/UserNameTokenAuthorizationTest.java   |   7 +-
 .../ws/security/wss4j/WSS4JFaultCodeTest.java   |   8 +-
 .../cxf/ws/security/wss4j/WSS4JInOutTest.java   |  19 ++--
 .../security/wss4j/WSS4JOutInterceptorTest.java |  11 +-
 .../wss4j/saml/AbstractSAMLCallbackHandler.java |   5 +-
 .../org/apache/cxf/sts/SignatureProperties.java |   3 +-
 .../ClaimsAttributeStatementProvider.java   |   6 +-
 .../cxf/sts/operation/AbstractOperation.java|  17 +--
 .../sts/rest/RESTSecurityTokenServiceImpl.java  |   8 +-
 .../cxf/sts/service/EncryptionProperties.java   |  19 ++--
 .../token/delegation/SAMLDelegationHandler.java |   4 +-
 .../ActAsAttributeStatementProvider.java|   4 +-
 .../DefaultAttributeStatementProvider.java  |   6 +-
 .../token/provider/DefaultSubjectProvider.java  |  10 +-
 .../sts/token/provider/SAMLTokenProvider.java   |  10 +-
 .../sts/token/provider/SamlCallbackHandler.java |   6 +-
 .../sts/token/provider/SymmetricKeyHandler.java |  14 +--
 .../cxf/sts/token/renewer/SAMLTokenRenewer.java |   3 +-
 .../sts/token/validator/SAMLTokenValidator.java |   4 +-
 .../token/validator/UsernameTokenValidator.java |   4 +-
 .../sts/token/validator/X509TokenValidator.java |   5 +-
 .../claims/mapper/JexlIssueSamlClaimsTest.java  |   9 +-
 .../cxf/sts/common/CustomAttributeProvider.java |  12 +--
 .../sts/operation/IssueEncryptedUnitTest.java   |  33 +++---
 .../sts/operation/IssueJWTClaimsUnitTest.java   |  18 ++--
 .../operation/IssueJWTOnbehalfofUnitTest.java   |   8 +-
 .../sts/operation/IssueJWTRealmUnitTest.java|   8 +-
 .../cxf/sts/operation/IssueJWTUnitTest.java |   8 +-
 .../sts/operation/IssueOnbehalfofUnitTest.java  |  60 +--
 .../cxf/sts/operation/IssueSCTUnitTest.java |  10 +-
 .../sts/operation/IssueSamlClaimsUnitTest.java  |  36 +++
 .../sts/operation/IssueSamlRealmUnitTest.java   |  18 ++--
 .../cxf/sts/operation/IssueSamlUnitTest.java|  61 +--
 .../apache/cxf/sts/operation/IssueUnitTest.java |   8 +-
 .../cxf/sts/operation/RenewSamlUnitTest.java

[4/8] cxf git commit: Fix a bunch more warnings

2017-08-10 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
--
diff --git 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
index 68a0ea9..c297388 100644
--- 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
+++ 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
@@ -39,7 +39,7 @@ import org.apache.cxf.phase.PhaseInterceptor;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.wss4j.common.ConfigurationConstants;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.junit.Test;
 
 
@@ -95,7 +95,7 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
 } catch (SoapFault fault) {
 assertTrue(fault.getReason().startsWith(
 "An error was discovered processing the  
header"));
-QName faultCode = new QName(WSConstants.WSSE_NS, 
"InvalidSecurity");
+QName faultCode = new QName(WSS4JConstants.WSSE_NS, 
"InvalidSecurity");
 assertTrue(fault.getFaultCode().equals(faultCode));
 }
 }
@@ -156,7 +156,7 @@ public class WSS4JFaultCodeTest extends 
AbstractSecurityTest {
 fail("Expected failure on an invalid Timestamp");
 } catch (SoapFault fault) {
 assertTrue(fault.getReason().contains("Invalid timestamp"));
-QName faultCode = new QName(WSConstants.WSSE_NS, "MessageExpired");
+QName faultCode = new QName(WSS4JConstants.WSSE_NS, 
"MessageExpired");
 assertTrue(fault.getFaultCode().equals(faultCode));
 }
 }
@@ -215,7 +215,7 @@ public class WSS4JFaultCodeTest extends 
AbstractSecurityTest {
 } catch (SoapFault fault) {
 assertTrue(fault.getReason().startsWith(
 "An error was discovered processing the  
header"));
-QName faultCode = new QName(WSConstants.WSSE_NS, 
"InvalidSecurity");
+QName faultCode = new QName(WSS4JConstants.WSSE_NS, 
"InvalidSecurity");
 assertTrue(fault.getFaultCode().equals(faultCode));
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
--
diff --git 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
index 238c620..3527cf4 100644
--- 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
+++ 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
@@ -52,6 +52,7 @@ import org.apache.cxf.phase.PhaseInterceptorChain;
 import org.apache.cxf.security.SecurityContext;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.wss4j.common.ConfigurationConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.principal.UsernameTokenPrincipal;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
@@ -201,7 +202,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
 outProperties.put(ConfigurationConstants.ENCRYPTION_USER, "myalias");
 outProperties.put(
 ConfigurationConstants.ENCRYPTION_PARTS,
-"{Content}{" + WSConstants.WSSE_NS + "}UsernameToken"
+"{Content}{" + WSS4JConstants.WSSE_NS + "}UsernameToken"
 );
 
 Map inProperties = new HashMap<>();
@@ -244,13 +245,13 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
 public void testUsernameToken() throws Exception {
 Map outProperties = new HashMap<>();
 outProperties.put(ConfigurationConstants.ACTION, 
ConfigurationConstants.USERNAME_TOKEN);
-outProperties.put(ConfigurationConstants.PASSWORD_TYPE, 
WSConstants.PW_TEXT);
+outProperties.put(ConfigurationConstants.PASSWORD_TYPE, 
WSS4JConstants.PW_TEXT);
 outProperties.put(ConfigurationConstants.USER, "alice");
 outProperties.put("password", "alicePassword");
 
 Map inProperties = new HashMap<>();
 inProperties.put(ConfigurationConstants.ACTION, 
ConfigurationConstants.USERNAME_TOKEN);
-inProperties.put(ConfigurationConstants.PASSWORD_TYPE, 
WSConstants.PW_DIGEST);
+inProperties.put(ConfigurationConstants.PASSWORD_TYPE, 
WSS4JConstants.PW_DIGEST);
 inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new 
TestPwdCallback());
 
 List xpaths = new ArrayList<>();

cxf git commit: Recording .gitmergeinfo Changes

2017-08-10 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 96508e7e9 -> 52e3e6a76


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

Branch: refs/heads/3.0.x-fixes
Commit: 52e3e6a76c0a4dd64939f9cc231ed87c5db90c4d
Parents: 96508e7
Author: Colm O hEigeartaigh 
Authored: Thu Aug 10 16:14:01 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Aug 10 16:14:01 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/52e3e6a7/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ffb6f35..3a6a7fb 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1029,6 +1029,7 @@ B 8967ec568c03e6b14a27b63698747135b82f80fc
 B 896f9890d996972b82afa819f0417876f5198c44
 B 897d81dc292eb6159aab96390cb3fbfed1c34a6b
 B 89b7bb172804ebaffaa69c9207065e50eb5a5d36
+B 89d74c9041b9fa9bd2f944a85fce9b1b2546238b
 B 89e055d3ad175002bce936b62d2fddf97044ca35
 B 8a1cd9a9f818c7eba2cb9f8bfa9863600af1ad98
 B 8a40a05adb01d318eff0e32430f36b267ca6019c
@@ -1546,6 +1547,7 @@ B cec8828bd220abd0d49457df707b9261b50e1a8e
 B cecf909b05e953590afab7fca0689c8dc4b78930
 B ceda250084949a8216a1d0f62cc64bd60d45a2fd
 B cef68665303f783fa25ae1ac974a3cb94732e228
+B cf8d2a2dac239d395e84a079115e0dcfc489487a
 B cf9d2131bb78b0c04248454b3ddc5fe5c6387674
 B cff8364b9c3aeef1fc0cc5fccb1d0fe4c40776ea
 B d016544ffa6ddb63d9ff55c22c375461ff5323e2

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

2017-08-10 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a41f31c1e -> cf8d2a2da


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

Branch: refs/heads/3.1.x-fixes
Commit: cf8d2a2dac239d395e84a079115e0dcfc489487a
Parents: 89d74c9
Author: Colm O hEigeartaigh 
Authored: Thu Aug 10 15:32:51 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Aug 10 15:32:51 2017 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cf8d2a2d/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 178c1e2..eb1a7fa 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -704,6 +704,7 @@ M c255034b2d6eb99bb2753b3d6932af06fd6cbe16
 M c2b13b7473781c3c1a4225a01c319cf8aa92cd0f
 M c48c368f4622d88673dcc77c5726f5563f792b07
 M c55034d9621bc904634017b552057474afb93ac2
+M c6ec599873a67cccae0a75270900c1cbec2cd796
 M c7d50ca238184789412737ea0f0db4b5b5503326
 M c87613b800a5b2de25d861c3c74a0fb7dcf60862
 M c8828d4e2c0e79c264301a5df08fb00cf5e51be5

[2/2] cxf git commit: NPE fix if a SAML Issuer is null

2017-08-10 Thread coheigea

NPE fix if a SAML Issuer is null

# Conflicts:
#   
rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 89d74c9041b9fa9bd2f944a85fce9b1b2546238b
Parents: a41f31c
Author: Colm O hEigeartaigh 
Authored: Thu Aug 10 15:10:58 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Aug 10 15:32:51 2017 +0100

--
 .../cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/89d74c90/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
index 6037934..c7d9cf8 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
@@ -168,8 +168,8 @@ public class SAMLSSOResponseValidator {
 }
 
 // Issuer value must match (be contained in) Issuer IDP
-if (enforceKnownIssuer && !issuerIDP.startsWith(issuer.getValue())) {
-LOG.fine("Issuer value: " + issuer.getValue() + " does not match 
issuer IDP: " 
+if (enforceKnownIssuer && (issuer.getValue() == null || 
!issuerIDP.startsWith(issuer.getValue( {
+LOG.fine("Issuer value: " + issuer.getValue() + " does not match 
issuer IDP: "
 + issuerIDP);
 throw new 
WSSecurityException(WSSecurityException.ErrorCode.FAILURE, 
"invalidSAMLsecurity");
 }

cxf git commit: NPE fix if a SAML Issuer is null

2017-08-10 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/master b62ea1115 -> c6ec59987


NPE fix if a SAML Issuer is null


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

Branch: refs/heads/master
Commit: c6ec599873a67cccae0a75270900c1cbec2cd796
Parents: b62ea11
Author: Colm O hEigeartaigh 
Authored: Thu Aug 10 15:10:58 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Aug 10 15:31:46 2017 +0100

--
 .../apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c6ec5998/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
index 5d38be7..0e70836 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
@@ -172,7 +172,7 @@ public class SAMLSSOResponseValidator {
 }
 
 // Issuer value must match (be contained in) Issuer IDP
-if (enforceKnownIssuer && !issuerIDP.startsWith(issuer.getValue())) {
+if (enforceKnownIssuer && (issuer.getValue() == null || 
!issuerIDP.startsWith(issuer.getValue( {
 LOG.fine("Issuer value: " + issuer.getValue() + " does not match 
issuer IDP: "
 + issuerIDP);
 throw new 
WSSecurityException(WSSecurityException.ErrorCode.FAILURE, 
"invalidSAMLsecurity");

cxf git commit: [CXF-6882] Making the error handlers optional

2017-08-10 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/master b003f35e6 -> b62ea1115


[CXF-6882] Making the error handlers optional


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

Branch: refs/heads/master
Commit: b62ea11153d17a5849ef4242842f22ca996ce2a1
Parents: b003f35
Author: Sergey Beryozkin 
Authored: Thu Aug 10 13:53:19 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu Aug 10 13:53:19 2017 +0100

--
 .../org/apache/cxf/jaxrs/nio/NioReadEntity.java | 21 ++---
 .../apache/cxf/jaxrs/nio/NioReadHandler.java|  4 +-
 .../cxf/jaxrs/nio/NioReadListenerImpl.java  | 29 +--
 .../apache/cxf/jaxrs/nio/NioWriteEntity.java|  4 +
 .../apache/cxf/jaxrs/nio/NioWriteHandler.java   |  4 +-
 .../cxf/jaxrs/nio/NioWriteListenerImpl.java |  6 +-
 .../cxf/systest/jaxrs/nio/NioBookStore.java | 86 +++-
 7 files changed, 94 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b62ea111/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadEntity.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadEntity.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadEntity.java
index 2dde9ae..40b1901 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadEntity.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadEntity.java
@@ -18,9 +18,8 @@
  */
 package org.apache.cxf.jaxrs.nio;
 
-import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.AsyncResponse;
 
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 import org.apache.cxf.message.Message;
@@ -30,23 +29,25 @@ public class NioReadEntity {
 private final NioReadHandler reader;
 private final NioReadCompletionHandler completion;
 private final NioErrorHandler error;
-
+public NioReadEntity(NioReadHandler reader, NioReadCompletionHandler 
completion) {
+this(reader, completion, null);
+}
 public NioReadEntity(NioReadHandler reader, NioReadCompletionHandler 
completion, NioErrorHandler error) {
 this.reader = reader;
 this.completion = completion;
 this.error = error;
 
+final Message m = JAXRSUtils.getCurrentMessage();
 try {
-final Message m = JAXRSUtils.getCurrentMessage();
-if (m != null) {
-final HttpServletRequest request = 
(HttpServletRequest)m.get(AbstractHTTPDestination.HTTP_REQUEST);
-if (request != null) {
-request.getInputStream().setReadListener(new 
NioReadListenerImpl(this, request.getInputStream()));
-}
+if (m.get(AsyncResponse.class) == null) {
+throw new IllegalStateException("AsyncResponse is not 
available");
 }
-} catch (final IOException ex) {
+final HttpServletRequest request = 
(HttpServletRequest)m.get(AbstractHTTPDestination.HTTP_REQUEST);
+request.getInputStream().setReadListener(new 
NioReadListenerImpl(this, request.getInputStream()));
+} catch (final Throwable ex) {
 throw new RuntimeException("Unable to initialize NIO entity", ex);
 }
+
 }
 
 public NioReadHandler getReader() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/b62ea111/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadHandler.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadHandler.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadHandler.java
index b5c6674..c26a4ea 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadHandler.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadHandler.java
@@ -18,6 +18,8 @@
  */
 package org.apache.cxf.jaxrs.nio;
 
+import java.io.IOException;
+
 /**
  * Class NioReader.
  */
@@ -30,6 +32,6 @@ public interface NioReadHandler {
  *
  * @param in input stream.
  */
-void read(NioInputStream in);
+void read(NioInputStream in) throws IOException;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b62ea111/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadListenerImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioReadListenerImpl.java

cxf git commit: CXF-7085: Introduce support for Server Sent Events (Client). Multiple bugfixes and improvements

[2/4] cxf git commit: Remove a bunch of pointless "TODO Auto-generated method" comments

[4/4] cxf git commit: Start going through the "TODO Auto-generated catch block"'s to figure out what should be done

[3/4] cxf git commit: Remove a bunch of pointless "TODO Auto-generated method" comments

[1/4] cxf git commit: Don't use deprecated method of configuration

cxf-fediz git commit: Removing accidental commit

cxf-fediz git commit: Removing accidental commit

[5/8] cxf git commit: Fix a bunch more warnings

[8/8] cxf git commit: Add some NPE checks

[1/8] cxf git commit: Fix a bunch more warnings

[3/8] cxf git commit: Fix a bunch more warnings

[2/8] cxf git commit: Fix a bunch more warnings

[7/8] cxf git commit: Use commons-text since the escape stuff in commons-lang is deprecated and no longer maintained

[6/8] cxf git commit: Fix a bunch more warnings

[4/8] cxf git commit: Fix a bunch more warnings

cxf git commit: Recording .gitmergeinfo Changes

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

[2/2] cxf git commit: NPE fix if a SAML Issuer is null

cxf git commit: NPE fix if a SAML Issuer is null

cxf git commit: [CXF-6882] Making the error handlers optional

20 matches

Site Navigation

Mail list logo

Footer information