[03/42] cxf git commit: Demo Readme updates

[reta]

Demo Readme updates


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 31826a3c474b4a83a4ad0ef133182aae1a524fa7
Parents: 11e18bf
Author: Sergey Beryozkin 
Authored: Mon Jul 18 10:50:11 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 18 10:50:11 2016 +0300

--
 .../main/release/samples/jax_rs/spring_boot_scan/README  | 11 +++
 .../samples/jax_rs/spring_boot_scan/application/README   |  7 +--
 2 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/31826a3c/distribution/src/main/release/samples/jax_rs/spring_boot_scan/README
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/README 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/README
new file mode 100644
index 000..b8db25f
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/README
@@ -0,0 +1,11 @@
+== Spring Boot Scan Demo == 
+
+This sample project demonstrates how to autodiscover and use CXF JAX-RS 
services and clients
+with Spring Boot. 
+
+Check eureka-registry/README on how to run Eureka Registry.
+
+Check application/README on how to run a server application.
+
+Check client/README on how to run a command line client.
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/31826a3c/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
index 2f350ba..dbfa6a2 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
@@ -34,10 +34,5 @@ http://localhost:8080/services/helloservice/swagger.json 
will return a Swagger J
 description of services.
 
 
-Before running a command line client check the application has been 
registered, open a browser 
-and try "http://localhost:8761/eureka/apps;. Once you see a registration 
record, 
-open a new terminal window and run the client:
+Check client/README on how to run a command line client.
 
-
-$ mvn -Pclient
-

[19/42] cxf git commit: Update -Psetup.eclipse to setup workspace based on changes needed for latest checkstyle

[reta]

Update -Psetup.eclipse to setup workspace based on changes needed for latest 
checkstyle


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

Branch: refs/heads/master-jaxrs-2.1
Commit: b8ab7eaf4d070cf76c4f9088cefe1c0806cca1cd
Parents: b3677b6
Author: Daniel Kulp 
Authored: Thu Jul 21 10:58:37 2016 -0400
Committer: Daniel Kulp 
Committed: Thu Jul 21 10:58:37 2016 -0400

--
 etc/eclipse/template.checkstyle-config.xml  | 9 +++--
 pom.xml | 4 
 .../java/org/apache/cxf/binding/corba/CorbaConduit.java | 9 -
 3 files changed, 15 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b8ab7eaf/etc/eclipse/template.checkstyle-config.xml
--
diff --git a/etc/eclipse/template.checkstyle-config.xml 
b/etc/eclipse/template.checkstyle-config.xml
index 8f6dbe4..ac7151a 100644
--- a/etc/eclipse/template.checkstyle-config.xml
+++ b/etc/eclipse/template.checkstyle-config.xml
@@ -18,6 +18,11 @@
   under the License.
 -->
 
-
-
+
+
+
+
+
+
+
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b8ab7eaf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f11303f..3a5225e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,14 +276,17 @@
 
 
 
+
 
 
 
 
+
 
 
 
 
+
 
 
 
@@ -297,6 +300,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b8ab7eaf/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
--
diff --git 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
index 7518ece..98218ca 100644
--- 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
+++ 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
@@ -189,14 +189,13 @@ public class CorbaConduit implements Conduit {
 if (request == null) {
 throw new CorbaBindingException("Couldn't build the corba 
request");
 }
+Exception ex = null;
 try {
 request.invoke();
-} catch (SystemException ex) {
-message.setContent(Exception.class, new Fault(ex));
-message.setSystemException(ex);
-return;
+ex = request.env().exception();
+} catch (SystemException sysex) {
+ex = sysex;
 }
-Exception ex = request.env().exception();
 if (ex != null) {
 if (ex instanceof SystemException) {
 message.setContent(Exception.class, new Fault(ex));

[31/42] cxf git commit: FIx checkstyle issues

[reta]

FIx checkstyle issues


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 955fd4b7fee79642934a828b7758ce14f783364a
Parents: c515130
Author: Daniel Kulp 
Authored: Mon Jul 25 16:22:51 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 16:22:51 2016 -0400

--
 .../rs/client/SampleRestClientApplication.java  | 29 +++-
 .../rs/service/SampleRestApplication.java   |  2 +-
 .../rs/client/SampleRestClientApplication.java  | 21 --
 .../registry/eureka/RegistryApplication.java|  6 ++--
 4 files changed, 33 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 0fed450..8dbf659 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -31,7 +31,10 @@ import sample.rs.service.HelloService;
 @SpringBootApplication
 @EnableJaxRsWebClient
 @EnableJaxRsProxyClient
-public class SampleRestClientApplication {
+public final class SampleRestClientApplication {
+private SampleRestClientApplication() {
+}
+
 public static void main(String[] args) {
 new SpringApplicationBuilder(SampleRestClientApplication.class)
 .web(false)
@@ -40,24 +43,24 @@ public class SampleRestClientApplication {
 @Bean
 CommandLineRunner initWebClientRunner(final WebClient webClient) {
   
-  return new CommandLineRunner() {
+return new CommandLineRunner() {
 
-@Override
-public void run(String... runArgs) throws Exception {
-
System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class));
-}
-  };
+@Override
+public void run(String... runArgs) throws Exception {
+
System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class));
+}
+};
 }
 @Bean
 CommandLineRunner initProxyClientRunner(final HelloService client) {
   
-  return new CommandLineRunner() {
+return new CommandLineRunner() {
 
-@Override
-public void run(String... runArgs) throws Exception {
-System.out.println(client.sayHello("ApacheCxfProxyUser"));
-}
-  };
+@Override
+public void run(String... runArgs) throws Exception {
+System.out.println(client.sayHello("ApacheCxfProxyUser"));
+}
+};
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index aa8d358..50944a1 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -57,4 +57,4 @@ public class SampleRestApplication {
 }
 
 
- }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 660cec9..43d48a6 100644
--- 

[16/42] cxf git commit: [CXF-6973] Allow to configure http conduits and destinations using features

[reta]

[CXF-6973] Allow to configure http conduits and destinations using features


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

Branch: refs/heads/master-jaxrs-2.1
Commit: f761e1823ef1fc9aa051d89bf0a9172c5925cdda
Parents: fe4ee94
Author: Christian Schneider 
Authored: Thu Jul 21 10:11:58 2016 +0200
Committer: Christian Schneider 
Committed: Thu Jul 21 10:12:12 2016 +0200

--
 .../cxf/transport/http/HttpConduitConfig.java   | 73 
 .../cxf/transport/http/HttpConduitFeature.java  | 48 +
 .../transport/http/HttpDestinationConfig.java   | 37 ++
 .../transport/http/HttpDestinationFeature.java  | 47 +
 4 files changed, 205 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f761e182/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitConfig.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitConfig.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitConfig.java
new file mode 100644
index 000..bf09d5b
--- /dev/null
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitConfig.java
@@ -0,0 +1,73 @@
+/**
+ * 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.transport.http;
+
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
+import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.configuration.security.ProxyAuthorizationPolicy;
+import org.apache.cxf.transport.http.auth.HttpAuthSupplier;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+
+/**
+ * Holds http conduit configs for the HttpConduitFeature
+ */
+public class HttpConduitConfig {
+private TLSClientParameters tlsClientParameters;
+private HTTPClientPolicy clientPolicy;
+private HttpAuthSupplier authSupplier;
+private ProxyAuthorizationPolicy proxyAuthorizationPolicy;
+private AuthorizationPolicy authorizationPolicy;
+
+public void setTlsClientParameters(TLSClientParameters 
tlsClientParameters) {
+this.tlsClientParameters = tlsClientParameters;
+}
+public HTTPClientPolicy getClientPolicy() {
+return clientPolicy;
+}
+public void setClientPolicy(HTTPClientPolicy clientPolicy) {
+this.clientPolicy = clientPolicy;
+}
+public void setAuthSupplier(HttpAuthSupplier authSupplier) {
+this.authSupplier = authSupplier;
+}
+public void setProxyAuthorizationPolicy(ProxyAuthorizationPolicy 
proxyAuthorizationPolicy) {
+this.proxyAuthorizationPolicy = proxyAuthorizationPolicy;
+}
+public void setAuthorizationPolicy(AuthorizationPolicy 
authorizationPolicy) {
+this.authorizationPolicy = authorizationPolicy;
+}
+
+public void apply(HTTPConduit conduit) {
+if (tlsClientParameters != null) {
+conduit.setTlsClientParameters(tlsClientParameters);
+}
+if (clientPolicy != null) {
+conduit.setClient(clientPolicy);
+}
+if (authSupplier != null) {
+conduit.setAuthSupplier(authSupplier);
+}
+if (proxyAuthorizationPolicy != null) {
+conduit.setProxyAuthorization(proxyAuthorizationPolicy);
+}
+if (authorizationPolicy != null) {
+conduit.setAuthorization(authorizationPolicy);
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/f761e182/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitFeature.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitFeature.java
 

[10/42] cxf git commit: Updating ContainerRequestContextImpl to try and make new security context visible to CXF interceptors too

[reta]

Updating ContainerRequestContextImpl to try and make new security context 
visible to CXF interceptors too


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 2ed93ca443d4369203a7b927bfa335a6b4e4b540
Parents: f376b31
Author: Sergey Beryozkin 
Authored: Tue Jul 19 21:30:38 2016 +0300
Committer: Sergey Beryozkin 
Committed: Tue Jul 19 21:30:38 2016 +0300

--
 .../org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2ed93ca4/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
index 9110e3e..1fa9557 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
@@ -134,6 +134,10 @@ public class ContainerRequestContextImpl extends 
AbstractRequestContextImpl
 public void setSecurityContext(SecurityContext sc) {
 checkContext();
 m.put(SecurityContext.class, sc);
+if (sc instanceof org.apache.cxf.security.SecurityContext) {
+m.put(org.apache.cxf.security.SecurityContext.class, 
+  (org.apache.cxf.security.SecurityContext)sc);
+}
 }
 
 private void checkNotPreMatch() {

[36/42] cxf git commit: CXF-5855: Introduce support for Server Sent Events. Initial implementation based on Atmosphere

[reta]

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/jax_rs/sse_tomcat/README.txt
--
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/README.txt 
b/distribution/src/main/release/samples/jax_rs/sse_tomcat/README.txt
new file mode 100644
index 000..2e4a2e3
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/README.txt
@@ -0,0 +1,35 @@
+JAX-RS SSE Demo 
+=
+
+This is a SSE version of JAX-RS Basic Demo.
+
+A SSE endpoint service is provided on URL 
http://localhost:8686/rest/api/stats/sse/{id}
+where {id} is any integer value, f.e.:
+
+  http://localhost:8686/rest/api/stats/sse/1
+
+This sample includes a simple web UI using Highcharts JavaScript library to 
show off
+randomly generated statistics about particular server, pushed to the client 
using
+SSE JAX-RS endpoint. The UI is available at
+
+  http://localhost:8686/static/index.html 
+
+Under the hood, embedded Tomcat 8 container is being used.
+
+Building and running the demo using maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the maven pom.xml file can be used to build and run the demo. 
+
+Using either UNIX or Windows:
+
+  mvn install
+  mvn -Pserver
+
+To remove the target dir, run mvn clean".  
+
+Connecting to the SSE stream
+---
+
+Open a web browser at: http://localhost:8686/static/index.html 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml 
b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
new file mode 100644
index 000..06d905b
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
@@ -0,0 +1,140 @@
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+JAX-RS SSE Demo (Tomcat 8)
+JAX-RS SSE Demo (Tomcat 8)
+jax_rs_sse_tomcat
+
+
+org.apache.cxf.samples
+cxf-samples
+3.2.0-SNAPSHOT
+../..
+
+
+
+UTF-8
+8.0.32
+
+
+
+
+org.springframework
+spring-context
+
+
+
+org.springframework
+spring-web
+
+
+
+org.apache.cxf
+cxf-rt-frontend-jaxrs
+3.2.0-SNAPSHOT
+
+
+
+org.apache.cxf
+cxf-rt-rs-sse
+3.2.0-SNAPSHOT
+
+
+
+com.fasterxml.jackson.jaxrs
+jackson-jaxrs-json-provider
+
+
+
+com.fasterxml.jackson.core
+jackson-core
+
+
+
+org.apache.tomcat.embed
+tomcat-embed-core
+${cxf.tomcat.version}
+
+
+
+org.apache.tomcat.embed
+tomcat-embed-logging-juli
+${cxf.tomcat.version}
+
+
+
+org.apache.tomcat.embed
+tomcat-embed-jasper
+${cxf.tomcat.version}
+
+
+
+org.apache.tomcat
+tomcat-jasper
+${cxf.tomcat.version}
+
+
+
+org.apache.tomcat
+tomcat-jasper-el
+${cxf.tomcat.version}
+
+
+
+org.apache.tomcat
+tomcat-jsp-api
+${cxf.tomcat.version}
+
+
+
+org.apache.tomcat.embed
+tomcat-embed-websocket
+${cxf.tomcat.version}
+
+
+
+org.atmosphere
+atmosphere-runtime
+2.4.3
+
+
+
+
+
+server
+
+test
+
+
+org.codehaus.mojo
+exec-maven-plugin
+
+
+test
+
+java
+
+
+
demo.jaxrs.sse.StatsServer
+
+
+
+
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+1.8
+1.8
+
+
+
+
+

[25/42] cxf git commit: Updating SpringBoot demos

[reta]

Updating SpringBoot demos


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 9fb6e045939f9d0a5bcdb735d6f44158e38f0d68
Parents: f462c79
Author: Sergey Beryozkin 
Authored: Sun Jul 24 22:11:22 2016 +0300
Committer: Sergey Beryozkin 
Committed: Sun Jul 24 22:11:22 2016 +0300

--
 distribution/src/main/release/samples/jax_rs/spring_boot/README | 5 +
 .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 5 +
 .../release/samples/jax_rs/spring_boot_scan/application/README  | 4 
 .../release/samples/jax_rs/spring_boot_scan/application/pom.xml | 5 +
 4 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9fb6e045/distribution/src/main/release/samples/jax_rs/spring_boot/README
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/README 
b/distribution/src/main/release/samples/jax_rs/spring_boot/README
index d309ad4..21c6e5b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/README
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/README
@@ -20,6 +20,11 @@ will display "Hello2 ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!"
 http://localhost:8080/services/helloservice/swagger.json will return a Swagger 
JSON
 description of services.
 
+To view the Swagger document using Swagger-UI, use your Browser to 
+open the Swagger-UI page at
+
+  
http://localhost:8080/services/helloservice/api-docs?url=/services/helloservice/swagger.json
+
 To run the client from a command line open a new terminal window and run:
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9fb6e045/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml 
b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index 098a0e0..764f52f 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -22,6 +22,11 @@
 ${cxf.version}
 
 
+  org.webjars
+  swagger-ui
+  2.1.0
+
+
 org.apache.cxf
 cxf-rt-rs-service-description-swagger
 ${cxf.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/9fb6e045/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
index dbfa6a2..a054dc8 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
@@ -33,6 +33,10 @@ will display "Hello2 ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!"
 http://localhost:8080/services/helloservice/swagger.json will return a Swagger 
JSON
 description of services.
 
+To view the Swagger document using Swagger-UI, use your Browser to 
+open the Swagger-UI page at
+
+  
http://localhost:8080/services/helloservice/api-docs?url=/services/helloservice/swagger.json
 
 Check client/README on how to run a command line client.
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9fb6e045/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 856becc..1ca080c 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -25,6 +25,11 @@
 ${cxf.version}
 
 
+  org.webjars
+  swagger-ui
+  2.1.0
+
+
 org.apache.cxf
 cxf-rt-rs-service-description-swagger
 ${cxf.version}

[05/42] cxf git commit: [CXF-6971] Updating Jettison version to 1.3.8

[reta]

[CXF-6971] Updating Jettison version to 1.3.8


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 8f8e587cde7ec97410da6b0586810ccf8f0f3233
Parents: 575dc4d
Author: Sergey Beryozkin 
Authored: Mon Jul 18 21:34:46 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 18 21:34:46 2016 +0300

--
 parent/pom.xml|  2 +-
 .../cxf/jaxrs/provider/json/JSONProviderTest.java | 18 ++
 2 files changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8f8e587c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 82aa500..ff3ffd8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -117,7 +117,7 @@
 ${cxf.jaxb.version}
 2.7
 1.0
-1.3.7
+1.3.8
 8.1.19.v20160209
 9.3.5.v20151012
 ${cxf.jetty9.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/8f8e587c/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
--
diff --git 
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
 
b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index 1258e82..88a5ab7 100644
--- 
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ 
b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -1367,6 +1367,24 @@ public class JSONProviderTest extends Assert {
 }
 
 @Test
+public void testAttributesAsElementsWithInteger() throws Exception {
+JSONProvider provider = new JSONProvider();
+provider.setAttributesToElements(true);
+provider.setIgnoreNamespaces(true);
+TagVO2 tag = new TagVO2("A", "B");
+tag.setAttrInt(123);
+TagVO2Holder holder = new TagVO2Holder();
+holder.setTag(tag);
+
+ByteArrayOutputStream bos = new ByteArrayOutputStream();
+provider.writeTo(holder, TagVO2Holder.class, TagVO2Holder.class,
+   new Annotation[0], MediaType.TEXT_XML_TYPE, new 
MetadataMap(), bos);
+String expected = 
+
"{\"tagholder\":{\"attr\":\"attribute\",\"thetag\":{\"attrInt\":123,\"group\":\"B\",\"name\":\"A\"}}}";
+assertEquals(expected, bos.toString());
+}
+
+@Test
 public void testOutAttributesAsElementsForList() throws Exception {
 
 //Provider

[39/42] cxf git commit: CXF-5855: Introduce support for Server Sent Events. Initial implementation based on Atmosphere

[reta]

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/jax_rs/sse_spring/README.txt
--
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/README.txt 
b/distribution/src/main/release/samples/jax_rs/sse_spring/README.txt
new file mode 100644
index 000..7a1901f
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/README.txt
@@ -0,0 +1,35 @@
+JAX-RS SSE Demo 
+=
+
+This is a SSE version of JAX-RS Basic Demo using Spring.
+
+A SSE endpoint service is provided on URL 
http://localhost:8686/rest/api/stats/sse/{id}
+where {id} is any integer value, f.e.:
+
+  http://localhost:8686/rest/api/stats/sse/1
+
+This sample includes a simple web UI using Highcharts JavaScript library to 
show off
+randomly generated statistics about particular server, pushed to the client 
using
+SSE JAX-RS endpoint. The UI is available at
+
+  http://localhost:8686/static/ 
+
+Under the hood, embedded Jetty 9 container is being used.
+
+Building and running the demo using maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the maven pom.xml file can be used to build and run the demo. 
+
+Using either UNIX or Windows:
+
+  mvn install
+  mvn -Pserver
+
+To remove the target dir, run mvn clean".  
+
+Connecting to the SSE stream
+---
+
+Open a web browser at: http://localhost:8686/static/

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml 
b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
new file mode 100644
index 000..fcab85d
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
@@ -0,0 +1,142 @@
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+JAX-RS SSE Demo (Jetty 9)
+JAX-RS SSE Demo (Jetty 9)
+jax_rs_sse_spring
+
+
+org.apache.cxf.samples
+cxf-samples
+3.2.0-SNAPSHOT
+../..
+
+
+
+UTF-8
+9.3.5.v20151012
+
+
+
+
+org.apache.cxf
+cxf-rt-frontend-jaxrs
+3.2.0-SNAPSHOT
+
+
+
+org.apache.cxf
+cxf-rt-rs-sse
+3.2.0-SNAPSHOT
+
+
+
+com.fasterxml.jackson.jaxrs
+jackson-jaxrs-json-provider
+
+
+
+com.fasterxml.jackson.core
+jackson-core
+
+
+
+org.jboss.weld.servlet
+weld-servlet
+2.2.16.Final
+
+
+
+org.jboss.weld
+weld-core
+2.2.16.Final
+
+
+
+org.eclipse.jetty
+jetty-server
+
+
+
+org.eclipse.jetty
+jetty-plus
+
+
+
+org.eclipse.jetty
+apache-jsp
+${cxf.jetty9.version}
+
+
+ 
+org.eclipse.jetty
+jetty-webapp
+
+
+
+org.eclipse.jetty
+jetty-webapp
+
+
+
+org.eclipse.jetty.websocket
+websocket-server
+${cxf.jetty9.version}
+
+
+
+org.springframework
+spring-context
+
+
+
+org.springframework
+spring-web
+
+
+
+org.atmosphere
+atmosphere-runtime
+2.4.3
+
+
+
+
+
+server
+
+test
+
+
+org.codehaus.mojo
+exec-maven-plugin
+
+
+test
+
+java
+
+
+
demo.jaxrs.sse.StatsServer
+
+
+
+
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+1.8
+1.8
+
+
+
+
+

[02/42] cxf git commit: Moving a demo client code into its module

[reta]

Moving a demo client code into its module


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 11e18bf5622cafdb10723cee895885d676b35a7b
Parents: 131449d
Author: Sergey Beryozkin 
Authored: Mon Jul 18 10:36:26 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 18 10:36:26 2016 +0300

--
 .../jax_rs/spring_boot_scan/application/pom.xml | 33 +--
 .../rs/client/SampleRestClientApplication.java  | 95 
 .../src/main/resources/application.yml  |  5 +-
 .../jax_rs/spring_boot_scan/client/README   | 33 +++
 .../jax_rs/spring_boot_scan/client/pom.xml  | 64 +
 .../rs/client/SampleRestClientApplication.java  | 95 
 .../java/sample/rs/service/HelloService.java| 34 +++
 .../client/src/main/resources/application.yml   | 12 +++
 8 files changed, 240 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/11e18bf5/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 50c3f98..856becc 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -6,7 +6,7 @@
 spring-boot-starter-parent
 1.3.6.RELEASE
  
-spring-boot-sample-rs-cxf-scan
+spring-boot-sample-rs-cxf-scan-app
 org.apache.cxf.samples
 3.2.0-SNAPSHOT
 Spring Boot CXF REST Scan Application
@@ -29,11 +29,6 @@
 cxf-rt-rs-service-description-swagger
 ${cxf.version}
 
-
-org.apache.cxf
-cxf-rt-features-clustering
-${cxf.version}
-
 
 
 org.springframework.cloud
@@ -46,11 +41,6 @@
 spring-boot-actuator
 ${spring.boot.version}
 
-
-org.qi4j.library
-org.qi4j.library.circuitbreaker
-${cxf.zest.version}
-
 
 

@@ -61,27 +51,6 @@
  
   org.springframework.boot
   spring-boot-maven-plugin
-  
-sample.rs.service.SampleRestApplication
-
- 
-   
-  
-   
-   
- client
- 
-   spring-boot:run
-   
- 
-  org.springframework.boot
-  spring-boot-maven-plugin
-  
-
sample.rs.client.SampleRestClientApplication
-
-   
--eureka.client.registerWithEureka=false
- 
-
  

   

http://git-wip-us.apache.org/repos/asf/cxf/blob/11e18bf5/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/client/SampleRestClientApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/client/SampleRestClientApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/client/SampleRestClientApplication.java
deleted file mode 100644
index 660cec9..000
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ /dev/null
@@ -1,95 +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 sample.rs.client;
-
-import 

[33/42] cxf git commit: CXF-5855: Introduce support for Server Sent Events. Initial implementation based on Atmosphere

[reta]

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index d73a7d0..bd7727c 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -114,6 +114,9 @@
 jax_rs/tracing_htrace
 clustering/failover_jaxws_osgi
 clustering/failover_server
+jax_rs/sse_cdi
+jax_rs/sse_tomcat
+jax_rs/sse_spring
 
 
+
+
+maven.java.net
+java.net snapshots
+https://maven.java.net/content/repositories/snapshots/
+
+false
+
+
+true
+
+
+
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
index d4e53ac..0f481a3 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
@@ -193,6 +193,7 @@ public class JAXRSServerFactoryBean extends 
AbstractJAXRSFactoryBean {
 checkPrivateEndpoint(ep);
 
 
factory.applyDynamicFeatures(getServiceFactory().getClassResourceInfo());
+applyBusFeatures(getBus());
 applyFeatures();
 
 
getServiceFactory().sendEvent(FactoryBeanListener.Event.SERVER_CREATED,
@@ -246,6 +247,14 @@ public class JAXRSServerFactoryBean extends 
AbstractJAXRSFactoryBean {
 
 }
 
+protected void applyBusFeatures(final Bus bus) {
+if (bus.getFeatures() != null) {
+for (Feature feature : bus.getFeatures()) {
+feature.initialize(server, bus);
+}
+}
+}
+
 protected void applyFeatures() {
 if (getFeatures() != null) {
 for (Feature feature : getFeatures()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index 0914854..e57f3e0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -32,6 +32,9 @@ import javax.ws.rs.HttpMethod;
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.NioCompletionHandler;
+import javax.ws.rs.core.NioErrorHandler;
+import javax.ws.rs.core.NioReaderHandler;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.ResponseBuilder;
@@ -382,4 +385,24 @@ public class RequestImpl implements Request {
 return 0;
 }
 }
+
+@Override
+public void entity(NioReaderHandler arg0) {
+// TODO: Implementation required (JAX-RS 2.1)
+}
+
+@Override
+public void entity(NioReaderHandler arg0, NioCompletionHandler arg1) {
+// TODO: Implementation required (JAX-RS 2.1)
+}
+
+@Override
+public void entity(NioReaderHandler arg0, NioErrorHandler arg1) {
+// TODO: Implementation required (JAX-RS 2.1)
+}
+
+@Override
+public void entity(NioReaderHandler arg0, NioCompletionHandler arg1, 
NioErrorHandler arg2) {
+// TODO: Implementation required (JAX-RS 2.1)
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
index cee5d36..29c5c42 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
@@ -34,6 +34,8 @@ import javax.ws.rs.core.Link;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.NioErrorHandler;
+import javax.ws.rs.core.NioWriterHandler;
 import javax.ws.rs.core.Response;
 import 

[29/42] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

[reta]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 7c594df67a7a15be3dff65b189981353c3d908ea
Parents: f18d412 9b2bda5
Author: Sergey Beryozkin 
Authored: Mon Jul 25 13:39:10 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 25 13:39:10 2016 +0300

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7c594df6/parent/pom.xml
--

[07/42] cxf git commit: Another update to ClientCodeRequestFilter

[reta]

Another update to ClientCodeRequestFilter


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 2d38ac06b2c0f8d4a3f35693aae6237ead27e35d
Parents: 189756a
Author: Sergey Beryozkin 
Authored: Tue Jul 19 12:37:22 2016 +0300
Committer: Sergey Beryozkin 
Committed: Tue Jul 19 12:37:22 2016 +0300

--
 .../security/oauth2/client/ClientCodeRequestFilter.java   | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2d38ac06/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
index a0d82b3..b7a0c01 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
@@ -83,15 +83,16 @@ public class ClientCodeRequestFilter implements 
ContainerRequestFilter {
 checkSecurityContextStart(rc);
 UriInfo ui = rc.getUriInfo();
 String absoluteRequestUri = ui.getAbsolutePath().toString();
-
+boolean sameRedirectUri = false;
 if (completeUri == null) {
 String referer = rc.getHeaderString("Referer");
 if (referer != null && 
referer.startsWith(authorizationServiceUri)) {
 completeUri = absoluteRequestUri;
+sameRedirectUri = true;
 } 
 }
 
-if (isStartUriMatched(ui, absoluteRequestUri)) {
+if (isStartUriMatched(ui, absoluteRequestUri, sameRedirectUri)) {
 ClientTokenContext request = getClientTokenContext(rc);
 if (request != null) {
 setClientCodeRequest(request);
@@ -120,10 +121,11 @@ public class ClientCodeRequestFilter implements 
ContainerRequestFilter {
 rc.abortWith(Response.status(401).build());
 }
 
-protected boolean isStartUriMatched(UriInfo ui, String absoluteRequestUri) 
{
+protected boolean isStartUriMatched(UriInfo ui, String absoluteRequestUri, 
boolean sameRedirectUri) {
 // If all request URIs can initiate a code flow then it is a match 
 // unless the current request URI matches a non-null completeUri 
-if (startUri == null && completeUri != null && 
!absoluteRequestUri.endsWith(completeUri)) {
+if (startUri == null 
+&& (completeUri != null && 
!absoluteRequestUri.endsWith(completeUri) || !sameRedirectUri)) {
 return true;
 }
 // If completeUri is null or startUri equals to it then check the code 
flow

[09/42] cxf git commit: Yet another update to ClientCodeRequestFilter

[reta]

Yet another update to ClientCodeRequestFilter


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

Branch: refs/heads/master-jaxrs-2.1
Commit: f376b314ea96b60043efab17397ca39fcf540de3
Parents: bf3b463
Author: Sergey Beryozkin 
Authored: Tue Jul 19 21:11:15 2016 +0300
Committer: Sergey Beryozkin 
Committed: Tue Jul 19 21:11:15 2016 +0300

--
 .../cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f376b314/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
index b7a0c01..dfd1826 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
@@ -124,8 +124,7 @@ public class ClientCodeRequestFilter implements 
ContainerRequestFilter {
 protected boolean isStartUriMatched(UriInfo ui, String absoluteRequestUri, 
boolean sameRedirectUri) {
 // If all request URIs can initiate a code flow then it is a match 
 // unless the current request URI matches a non-null completeUri 
-if (startUri == null 
-&& (completeUri != null && 
!absoluteRequestUri.endsWith(completeUri) || !sameRedirectUri)) {
+if (startUri == null && completeUri != null && 
!absoluteRequestUri.endsWith(completeUri)) {
 return true;
 }
 // If completeUri is null or startUri equals to it then check the code 
flow
@@ -137,7 +136,8 @@ public class ClientCodeRequestFilter implements 
ContainerRequestFilter {
 }
 }
 // Finally compare start URI with the request URI
-return startUri != null && absoluteRequestUri.endsWith(startUri);
+return startUri == null && !sameRedirectUri 
+|| startUri != null && absoluteRequestUri.endsWith(startUri);
 }
 
 private boolean codeResponseQueryParamsAvailable(MultivaluedMap queries) {

[17/42] cxf git commit: [CXF-6973] Remove slf4j to fix build

[reta]

[CXF-6973] Remove slf4j to fix build


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 9e42b9bff4b3a10049d4fbf29b17729c56b88387
Parents: f761e18
Author: Christian Schneider 
Authored: Thu Jul 21 10:19:38 2016 +0200
Committer: Christian Schneider 
Committed: Thu Jul 21 10:19:38 2016 +0200

--
 .../java/org/apache/cxf/transport/http/HttpConduitFeature.java| 3 ---
 .../org/apache/cxf/transport/http/HttpDestinationFeature.java | 3 ---
 2 files changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9e42b9bf/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitFeature.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitFeature.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitFeature.java
index 73c297b..c39d351 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitFeature.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpConduitFeature.java
@@ -22,15 +22,12 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.transport.Conduit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Programmatically configure a http conduit. This can also be used as a DOSGi
  * intent.
  */
 public class HttpConduitFeature extends AbstractFeature {
-static final Logger LOG = 
LoggerFactory.getLogger(HttpConduitFeature.class);
 private HttpConduitConfig conduitConfig;
 
 @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/9e42b9bf/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpDestinationFeature.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpDestinationFeature.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpDestinationFeature.java
index a90194f..02dcac2 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpDestinationFeature.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpDestinationFeature.java
@@ -22,15 +22,12 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.transport.Destination;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Programmatically configure a http destination. This can also be used as a 
DOSGi
  * intent.
  */
 public class HttpDestinationFeature extends AbstractFeature {
-static final Logger LOG = 
LoggerFactory.getLogger(HttpDestinationFeature.class);
 private HttpDestinationConfig destinationConfig;
 
 @Override

[08/42] cxf git commit: [CXF-6972] Support for per-recipient JWE JSON headers

[reta]

[CXF-6972] Support for per-recipient JWE JSON headers


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

Branch: refs/heads/master-jaxrs-2.1
Commit: bf3b463d2b5e16ce69e4ca862d3ca141a750fa15
Parents: 2d38ac0
Author: Sergey Beryozkin 
Authored: Tue Jul 19 14:46:10 2016 +0300
Committer: Sergey Beryozkin 
Committed: Tue Jul 19 14:46:10 2016 +0300

--
 .../cxf/rs/security/jose/jwe/JweHeaders.java|  4 +++
 .../rs/security/jose/jwe/JweJsonConsumer.java   |  6 +++-
 .../rs/security/jose/jwe/JweJsonProducer.java   |  2 +-
 .../cxf/rs/security/jose/jws/JwsHeaders.java|  4 +++
 .../security/jose/jwe/JweJsonConsumerTest.java  | 29 
 .../security/jose/jwe/JweJsonProducerTest.java  | 14 +++---
 6 files changed, 53 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bf3b463d/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
index d1d8651..34266f6 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.rs.security.jose.jwe;
 
+import java.util.Collections;
 import java.util.Map;
 
 import org.apache.cxf.common.util.Base64UrlUtility;
@@ -48,6 +49,9 @@ public class JweHeaders extends JoseHeaders {
 public JweHeaders(Map values) {
 super(values);
 }
+public JweHeaders(String kid) {
+this(Collections.singletonMap(JoseConstants.HEADER_KEY_ID, kid));
+}
 public JweHeaders(KeyAlgorithm keyEncAlgo, ContentAlgorithm ctEncAlgo) {
 this(keyEncAlgo, ctEncAlgo, false);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/bf3b463d/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
index 0c8aecd..6e3954b 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
@@ -52,7 +52,11 @@ public class JweJsonConsumer {
 }
 
 public JweDecryptionOutput decryptWith(JweDecryptionProvider jwe) {
-JweJsonEncryptionEntry entry = getJweDecryptionEntry(jwe);
+return decryptWith(jwe, (Map)null);
+}
+public JweDecryptionOutput decryptWith(JweDecryptionProvider jwe, 
+   Map recipientProps) 
{
+JweJsonEncryptionEntry entry = getJweDecryptionEntry(jwe, 
recipientProps);
 return decryptWith(jwe, entry);
 }
 public JweDecryptionOutput decryptWith(JweDecryptionProvider jwe, 
JweJsonEncryptionEntry entry) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/bf3b463d/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
index 3c8385d..3a3d745 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
@@ -113,7 +113,7 @@ public class JweJsonProducer {
 LOG.warning("union and recipient unprotected headers have 
duplicate values");
 throw new 
JweException(JweException.Error.INVALID_JSON_JWE);
 }
-jsonHeaders = new JweHeaders(unionHeaders.asMap());
+jsonHeaders = new JweHeaders(new LinkedHashMap(unionHeaders.asMap()));
 jsonHeaders.asMap().putAll(perRecipientUnprotected.asMap());
 

[30/42] cxf git commit: [CXF-6960] Minor update to SwaggerUi resource

[reta]

[CXF-6960] Minor update to SwaggerUi resource


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

Branch: refs/heads/master-jaxrs-2.1
Commit: c515130f8ca8bf415bb3e1267517ceaea5676f78
Parents: 7c594df
Author: Sergey Beryozkin 
Authored: Mon Jul 25 13:49:55 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 25 13:49:55 2016 +0300

--
 .../src/main/release/samples/jax_rs/description_swagger2/pom.xml | 2 +-
 .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c515130f/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
index 9afb7c3..867ac0c 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -64,7 +64,7 @@
 
   org.webjars
   swagger-ui
-  2.1.0
+  2.1.8-M1
 
 
 org.apache.cxf

http://git-wip-us.apache.org/repos/asf/cxf/blob/c515130f/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 bf6440d..8bc8afa 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
@@ -279,11 +279,11 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 }
 @Path("api-docs")
 public static class SwaggerUIService {
-private static final String FAVICON_ICO = "favicon.ico";
+private static final String FAVICON = "favicon";
 @GET
 @Path("{resource:.*}")
 public Response getResource(@Context UriInfo uriInfo, 
@PathParam("resource") String resourcePath) {
-if (FAVICON_ICO.equals(resourcePath)) {
+if (resourcePath.contains(FAVICON)) {
 return Response.status(404).build();
 }
 if (StringUtils.isEmpty(resourcePath) || "/".equals(resourcePath)) 
{

[01/42] cxf git commit: Making some of CXF features auto-discoverable [Forced Update!]

[reta]

Repository: cxf
Updated Branches:
  refs/heads/master-jaxrs-2.1 d634c7e7c -> e24fb5bcf (forced update)


Making some of CXF features auto-discoverable


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 131449dc8bb210547ed01c4962e0f45a7bc86a6d
Parents: e2efd03
Author: Sergey Beryozkin 
Authored: Mon Jul 18 10:11:06 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 18 10:11:06 2016 +0300

--
 core/src/main/java/org/apache/cxf/feature/LoggingFeature.java| 3 +++
 .../src/main/java/org/apache/cxf/clustering/FailoverFeature.java | 4 
 .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java  | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/131449dc/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
--
diff --git a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java 
b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
index 4a0c028..ebda1bf 100644
--- a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
@@ -20,6 +20,8 @@ package org.apache.cxf.feature;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.annotations.Logging;
+import org.apache.cxf.annotations.Provider;
+import org.apache.cxf.annotations.Provider.Type;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.interceptor.AbstractLoggingInterceptor;
 import org.apache.cxf.interceptor.InterceptorProvider;
@@ -42,6 +44,7 @@ import org.apache.cxf.interceptor.LoggingOutInterceptor;
   
  */
 @NoJSR250Annotations
+@Provider(value = Type.Feature)
 public class LoggingFeature extends AbstractFeature {
 private static final int DEFAULT_LIMIT = 
AbstractLoggingInterceptor.DEFAULT_LIMIT;
 private static final LoggingInInterceptor IN = new 
LoggingInInterceptor(DEFAULT_LIMIT);

http://git-wip-us.apache.org/repos/asf/cxf/blob/131449dc/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
--
diff --git 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
index c9278f4..a911445 100644
--- 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
+++ 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
@@ -20,6 +20,9 @@ package org.apache.cxf.clustering;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.annotations.EvaluateAllEndpoints;
+import org.apache.cxf.annotations.Provider;
+import org.apache.cxf.annotations.Provider.Scope;
+import org.apache.cxf.annotations.Provider.Type;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ConduitSelector;
@@ -35,6 +38,7 @@ import org.apache.cxf.interceptor.InterceptorProvider;
  */
 @NoJSR250Annotations
 @EvaluateAllEndpoints
+@Provider(value = Type.Feature, scope = Scope.Client)
 public class FailoverFeature extends AbstractFeature {
 
 private FailoverStrategy failoverStrategy;

http://git-wip-us.apache.org/repos/asf/cxf/blob/131449dc/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 bc9102f..2722c08 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
@@ -37,6 +37,7 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.cxf.annotations.Provider;
+import org.apache.cxf.annotations.Provider.Scope;
 import org.apache.cxf.annotations.Provider.Type;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.endpoint.Server;
@@ -54,7 +55,7 @@ import io.swagger.jaxrs.config.DefaultReaderConfig;
 import io.swagger.jaxrs.config.ReaderConfig;
 import io.swagger.jaxrs.listing.ApiListingResource;
 
-@Provider(Type.Feature)
+@Provider(value = Type.Feature, scope = Scope.Server)
 public class Swagger2Feature extends AbstractSwaggerFeature {
 
 

[15/42] cxf git commit: [CXF-6972] Relaxing the requirement to extend JweJsonProducer when multiple recipients are used

[reta]

[CXF-6972] Relaxing the requirement to extend JweJsonProducer when multiple 
recipients are used


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

Branch: refs/heads/master-jaxrs-2.1
Commit: fe4ee94be6a2c6548c8e1beb409e511e826f1795
Parents: 8993a3d
Author: Sergey Beryozkin 
Authored: Wed Jul 20 23:16:58 2016 +0300
Committer: Sergey Beryozkin 
Committed: Wed Jul 20 23:16:58 2016 +0300

--
 .../jwe/AbstractContentEncryptionAlgorithm.java |  2 +-
 .../jose/jwe/AbstractJweEncryption.java | 54 ++--
 .../jwe/AesGcmContentEncryptionAlgorithm.java   |  6 +++
 .../security/jose/jwe/JweJsonProducerTest.java  | 13 ++---
 4 files changed, 38 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fe4ee94b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
index 355a21b..3e08de2 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
@@ -48,7 +48,7 @@ public abstract class AbstractContentEncryptionAlgorithm 
extends AbstractContent
 if (iv == null) {
 return CryptoUtils.generateSecureRandomBytes(getIvSize() / 8);
 } else if (iv.length > 0 && providedIvUsageCount.addAndGet(1) > 1) {
-LOG.warning("Custom IV is recommeded to be used once");
+LOG.warning("Custom IV is recommended to be used once");
 throw new JweException(JweException.Error.CUSTOM_IV_REUSED);
 } else {
 return iv;

http://git-wip-us.apache.org/repos/asf/cxf/blob/fe4ee94b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index 0260f70..a72b24a 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -87,7 +87,7 @@ public abstract class AbstractJweEncryption implements 
JweEncryptionProvider {
 }
 @Override
 public String encrypt(byte[] content, JweHeaders jweHeaders) {
-JweEncryptionInternal state = getInternalState(jweHeaders, null);
+JweEncryptionInternal state = getInternalState(jweHeaders, new 
JweEncryptionInput());
 
 byte[] encryptedContent = encryptInternal(state, content);
 byte[] cipher = getActualCipher(encryptedContent);
@@ -198,36 +198,36 @@ public abstract class AbstractJweEncryption implements 
JweEncryptionProvider {
 protectedHeaders = theHeaders;
 }
 
-
-
-byte[] theCek = jweInput != null && jweInput.getCek() != null 
+byte[] theCek = jweInput.getCek() != null 
 ? jweInput.getCek() : getContentEncryptionKey(theHeaders);
-String contentEncryptionAlgoJavaName = getContentEncryptionAlgoJava();
-KeyProperties keyProps = new 
KeyProperties(contentEncryptionAlgoJavaName);
-keyProps.setCompressionSupported(compressionRequired(theHeaders));
-
-byte[] theIv = jweInput != null && jweInput.getIv() != null  
-? jweInput.getIv() : 
getContentEncryptionAlgorithm().getInitVector();
-AlgorithmParameterSpec specParams = getAlgorithmParameterSpec(theIv);
-keyProps.setAlgoSpec(specParams);
-byte[] jweContentEncryptionKey = 
-getEncryptedContentEncryptionKey(theHeaders, theCek);
-
 
-String protectedHeadersJson = writer.toJson(protectedHeaders);
+JweEncryptionInternal state = new JweEncryptionInternal();
+state.jweContentEncryptionKey = 
getEncryptedContentEncryptionKey(theHeaders, theCek);
 
-byte[] additionalEncryptionParam = 

[37/42] cxf git commit: CXF-5855: Introduce support for Server Sent Events. Initial implementation based on Atmosphere

[reta]

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/web-ui/javascripts/jquery-1.9.0.min.js
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/web-ui/javascripts/jquery-1.9.0.min.js
 
b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/web-ui/javascripts/jquery-1.9.0.min.js
new file mode 100644
index 000..50d1b22
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/web-ui/javascripts/jquery-1.9.0.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | 
jquery.org/license */(function(e,t){"use strict";function n(e){var 
t=e.length,n=st.type(e);return 
st.isWindow(e)?!1:1===e.nodeType&?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof
 t&>0& in e)}function r(e){var t=Tt[e]={};return 
st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function 
i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof 
n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&if(f&[f]&&(i||c[f].data)||!u||r!==t)return
 
f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof
 n||"function"==typeof 
n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function
 o(e,t,n){if(st.acceptData(e)){var 
r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.conc
 at(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in 
r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete 
r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete 
u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete
 u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var 
i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof
 
r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else
 r=t}return r}function s(e){var t;for(t in 
e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function
 u(){return!0}function l(){return!1}function c(e,t){do 
e=e[t];while(e&&1!==e.nodeType);return e}function 
f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var 
i=!!t.call(e,r,e);return i===n});if(t.nodeType)return 
st.grep(e,function(e){return e===t===n});if("string"==typeof t){var 
r=st.grep(e,function(e){return 
 1===e.nodeType});if(Wt.test(t))return 
st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return 
st.inArray(e,t)>=0===n})}function p(e){var 
t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return
 n}function d(e,t){return 
e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function
 h(e){var t=e.getAttributeNode("type");return 
e.type=(t&)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return 
t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var 
n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function
 y(e,t){if(1===t.nodeType&(e)){var 
n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete 
a.handle,a.events={};for(n in 
s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function
 v(e,t){var 
n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&[st.ex
 pando]){r=st._data(t);for(i in 
r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function
 b(e,n){var 
r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return
 n===t||n&(e,n)?st.merge([e],a):a}function 
x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in 
e)return t;for(var 
n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in 
 e)return t;return r}function w(e,t){return 
e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function 
N(e,t){for(var 

[12/42] cxf git commit: Make it easier to specify additional claims to return in the UserInfoService

[reta]

Make it easier to specify additional claims to return in the UserInfoService


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

Branch: refs/heads/master-jaxrs-2.1
Commit: ce2d945bf62d77b8263790c8c8d7c4cdd36c0176
Parents: 689632b
Author: Colm O hEigeartaigh 
Authored: Wed Jul 20 14:39:55 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Jul 20 14:41:52 2016 +0100

--
 .../rs/security/oidc/idp/UserInfoService.java   | 20 
 1 file changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2d945b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java
index 7c4ec07..5b83a7b 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java
@@ -18,6 +18,9 @@
  */
 package org.apache.cxf.rs.security.oidc.idp;
 
+import java.util.Collections;
+import java.util.List;
+
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -39,6 +42,7 @@ import org.apache.cxf.rs.security.oidc.common.UserInfo;
 public class UserInfoService extends OAuthServerJoseJwtProducer {
 private UserInfoProvider userInfoProvider;
 private OAuthDataProvider oauthDataProvider;
+private List additionalClaims = Collections.emptyList();
 
 @Context
 private MessageContext mc;
@@ -101,6 +105,15 @@ public class UserInfoService extends 
OAuthServerJoseJwtProducer {
 if (idToken.getNickName() != null) {
 userInfo.setNickName(idToken.getNickName());
 }
+
+if (additionalClaims != null && !additionalClaims.isEmpty()) {
+for (String additionalClaim : additionalClaims) {
+if (idToken.containsProperty(additionalClaim)) {
+userInfo.setClaim(additionalClaim, 
idToken.getClaim(additionalClaim));
+}
+}
+}
+
 //etc
 return userInfo;
 }
@@ -112,4 +125,11 @@ public class UserInfoService extends 
OAuthServerJoseJwtProducer {
 public void setOauthDataProvider(OAuthDataProvider oauthDataProvider) {
 this.oauthDataProvider = oauthDataProvider;
 }
+
+/**
+ * Set additional claims to return (if they exist in the IdToken).
+ */
+public void setAdditionalClaims(List additionalClaims) {
+this.additionalClaims = additionalClaims;
+}
 }

[32/42] cxf git commit: CXF-5855: Introduce support for Server Sent Events. Initial implementation based on Atmosphere

[reta]

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java
--
diff --git 
a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java 
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java
new file mode 100644
index 000..4e0575f
--- /dev/null
+++ 
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java
@@ -0,0 +1,69 @@
+/**
+ * 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.sse;
+
+import java.io.IOException;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.sse.OutboundSseEvent;
+import javax.ws.rs.sse.SseContext;
+import javax.ws.rs.sse.SseEventOutput;
+
+@Path("/api/bookstore")
+public class BookStore {
+private static OutboundSseEvent createStatsEvent(final 
OutboundSseEvent.Builder builder, final int eventId) {
+return builder
+.id(Integer.toString(eventId))
+.data(Book.class, new Book("New Book #" + eventId, eventId))
+.mediaType(MediaType.APPLICATION_JSON_TYPE)
+.build();
+}
+
+@GET
+@Path("sse")
+@Produces(MediaType.SERVER_SENT_EVENTS)
+public SseEventOutput stats(@Context SseContext sseContext, 
@PathParam("id") final String id) {
+final SseEventOutput output = sseContext.newOutput();
+
+new Thread() {
+public void run() {
+try {
+
output.write(createStatsEvent(sseContext.newEvent().name("book"), 1));
+Thread.sleep(1000);
+
output.write(createStatsEvent(sseContext.newEvent().name("book"), 2));
+Thread.sleep(1000);
+
output.write(createStatsEvent(sseContext.newEvent().name("book"), 3));
+Thread.sleep(1000);
+
output.write(createStatsEvent(sseContext.newEvent().name("book"), 4));
+Thread.sleep(1000);
+output.close();
+} catch (final InterruptedException | IOException e) {
+e.printStackTrace();
+}
+}
+}.start();
+
+return output;
+}
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
--
diff --git 
a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
 
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
new file mode 100644
index 000..c0642e2
--- /dev/null
+++ 
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
@@ -0,0 +1,98 @@
+/**
+ * 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.sse.jetty;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+
+import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
+import org.apache.cxf.systest.jaxrs.sse.BookStore;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import 

[35/42] cxf git commit: CXF-5855: Introduce support for Server Sent Events. Initial implementation based on Atmosphere

[reta]

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/web-ui/javascripts/highcharts.js
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/web-ui/javascripts/highcharts.js
 
b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/web-ui/javascripts/highcharts.js
new file mode 100644
index 000..327d865
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/web-ui/javascripts/highcharts.js
@@ -0,0 +1,270 @@
+/*
+ Highcharts JS v3.0.1 (2013-04-09)
+
+ (c) 2009-2013 Torstein Hønsi
+
+ License: www.highcharts.com/license
+*/
+(function(){function v(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return 
a}function y(){var a,b=arguments.length,c={},d=function(a,b){var c,h;for(h in 
b)b.hasOwnProperty(h)&&(c=b[h],typeof a!=="object"&&(a={}),a[h]=c& 
c==="object"&(c)!=="[object Array]"& 
c.nodeType!=="number"?d(a[h]||{},c):b[h]);return 
a};for(a=0;a3?c.length%3:0;return
 
e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+Q(a-c).toFixed(f).slice(2):"")}function
 ua(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function 
Ea(a,b){for(var 
c="{",d=!1,e,f,g,h,i,j=[];(c=a.indexOf(c))!==-1;){e=a.slice(0,c);if(d){f=e.split(":");g=f.shift().split(".");i=g.length;e=b;for(h=0;h<
+i;h++)e=e[g[h]];if(f.length)f=f.join(":"),g=/\.([0-9])/,h=N.lang,i=void 
0,/f$/.test(f)?(i=(i=f.match(g))?i[1]:-1,e=Na(e,i,h.decimalPoint,f.indexOf(",")>-1?h.thousandsSep:"")):e=Ua(f,e)}j.push(e);a=a.slice(c+1);c=(d=!d)?"}":"{"}j.push(a);return
 j.join("")}function ib(a,b,c,d){var 
e,c=o(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d=E[jb]&&
+(i.setMilliseconds(0),i.setSeconds(j>=E[Va]?0:k*T(i.getSeconds()/k)));if(j>=E[Va])i[Bb](j>=E[Oa]?0:k*T(i[kb]()/k));if(j>=E[Oa])i[Cb](j>=E[oa]?0:k*T(i[lb]()/k));if(j>=E[oa])i[mb](j>=E[Pa]?1:k*T(i[Qa]()/k));j>=E[Pa]&&(i[Db](j>=E[va]?0:k*T(i[Xa]()/k)),h=i[Ya]());j>=E[va]&&(h-=h%k,i[Eb](h));if(j===E[Wa])i[mb](i[Qa]()-i[nb]()+o(d,1));b=1;h=i[Ya]();for(var
 
d=i.getTime(),m=i[Xa](),l=i[Qa](),i=g?0:(864E5+i.getTimezoneOffset()*6E4)%864E5;dc&&(c=a[b]);return c}function Ga(a,
+b){for(var c in a)a[c]&[c]!==b&[c].destroy&[c].destroy(),delete 
a[c]}function 
Ra(a){$a||($a=U(wa));a&&$a.appendChild(a);$a.innerHTML=""}function qa(a,b){var 
c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;else 

[24/42] cxf git commit: [CXF-6960] Service SwaggerUI resources if it is available on the classpath, can be disabled

[reta]

[CXF-6960] Service SwaggerUI resources if it is available on the classpath, can 
be disabled


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

Branch: refs/heads/master-jaxrs-2.1
Commit: f462c797eab75e9b6c6c352b4baeb84429866068
Parents: 22fd16d
Author: Sergey Beryozkin 
Authored: Sun Jul 24 21:47:39 2016 +0300
Committer: Sergey Beryozkin 
Committed: Sun Jul 24 21:47:39 2016 +0300

--
 .../jax_rs/description_swagger2/README.txt  |  9 ++-
 .../samples/jax_rs/description_swagger2/pom.xml | 44 
 .../java/demo/jaxrs/swagger/server/Server.java  | 12 
 .../jaxrs/swagger/AbstractSwaggerFeature.java   | 33 +++--
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 70 ++--
 .../cxf/jaxrs/swagger/SwaggerFeature.java   |  3 +-
 .../cxf/jaxrs/model/wadl/WadlGenerator.java |  2 +-
 .../servicelist/FormattedServiceListWriter.java |  7 +-
 8 files changed, 108 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f462c797/distribution/src/main/release/samples/jax_rs/description_swagger2/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/README.txt 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/README.txt
index 0a37472..af5a737 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/README.txt
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/README.txt
@@ -27,14 +27,17 @@ are available at
 To view the Swagger document using Swagger-UI, use your Browser to 
 open the Swagger-UI page at
 
-  http://localhost:9000/?url=/swagger.json
+  http://localhost:9000/api-docs?url=/swagger.json
 
 or
 
-  http://localhost:9000/?url=/swagger.yaml
+  http://localhost:9000/api-docs?url=/swagger.yaml
 
+or access it from the CXF Services page:
 
-To remove the target dir, run mvn clean".
+  http://localhost:9000/services
+  and follow a Swagger link.
+  
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/f462c797/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
index 9c9397e..9afb7c3 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -60,48 +60,12 @@
 
 
 
-
-
-
-org.apache.maven.plugins
-maven-dependency-plugin
-2.9
-
-
-generate-resources
-
-unpack
-
-
-
-
-org.webjars
-swagger-ui
-2.1.0
-true
-
${project.build.directory}/classes
-
-
-
-
-
-
-
-
-
 
 
   org.webjars
   swagger-ui
   2.1.0
-  provided
-
-
-org.apache.cxf
-cxf-rt-transports-http
-3.2.0-SNAPSHOT
 
-
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
@@ -118,14 +82,6 @@
 3.2.0-SNAPSHOT
 
 
-commons-httpclient
-commons-httpclient
-
-
-javax.ws.rs
-javax.ws.rs-api
-
-
 org.eclipse.jetty
 jetty-webapp
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/f462c797/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
index 

[11/42] cxf git commit: Make it possible to set a roleClaim on the OIDC filters so that we can implement authorization

[reta]

Make it possible to set a roleClaim on the OIDC filters so that we can 
implement authorization


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 689632b877f8aefcfd72211845f8e89d547e8592
Parents: 2ed93ca
Author: Colm O hEigeartaigh 
Authored: Wed Jul 20 14:36:02 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Jul 20 14:41:45 2016 +0100

--
 .../oidc/rp/OidcClientCodeRequestFilter.java |  9 -
 .../security/oidc/rp/OidcIdTokenRequestFilter.java   | 10 +-
 .../cxf/rs/security/oidc/rp/OidcSecurityContext.java | 15 +++
 3 files changed, 32 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/689632b8/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java
index 015be15..d9e75d9 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java
@@ -52,6 +52,7 @@ public class OidcClientCodeRequestFilter extends 
ClientCodeRequestFilter {
 private Long maxAgeOffset;
 private String claims;
 private String claimsLocales;
+private String roleClaim;
 
 public OidcClientCodeRequestFilter() {
 super();
@@ -87,7 +88,9 @@ public class OidcClientCodeRequestFilter extends 
ClientCodeRequestFilter {
ctx.getIdToken(),
getConsumer()));
 }
-rc.setSecurityContext(new OidcSecurityContext(ctx));
+OidcSecurityContext oidcSecCtx = new OidcSecurityContext(ctx);
+oidcSecCtx.setRoleClaim(roleClaim);
+rc.setSecurityContext(oidcSecCtx);
 }
 
 return ctx;
@@ -193,4 +196,8 @@ public class OidcClientCodeRequestFilter extends 
ClientCodeRequestFilter {
 public void setClaimsLocales(String claimsLocales) {
 this.claimsLocales = claimsLocales;
 }
+
+public void setRoleClaim(String roleClaim) {
+this.roleClaim = roleClaim;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/689632b8/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
index 1babee7..fa9d850 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
@@ -39,6 +39,7 @@ public class OidcIdTokenRequestFilter implements 
ContainerRequestFilter {
 private String tokenFormParameter = "id_token"; 
 private IdTokenReader idTokenReader;
 private Consumer consumer;
+private String roleClaim;
 
 @Override
 public void filter(ContainerRequestContext requestContext) throws 
IOException {
@@ -51,9 +52,12 @@ public class OidcIdTokenRequestFilter implements 
ContainerRequestFilter {
 
 IdToken idToken = idTokenReader.getIdToken(idTokenParamValue, 
consumer);
 JAXRSUtils.getCurrentMessage().setContent(IdToken.class, idToken);
-requestContext.setSecurityContext(new OidcSecurityContext(idToken));
 
+OidcSecurityContext oidcSecCtx = new OidcSecurityContext(idToken);
+oidcSecCtx.setRoleClaim(roleClaim);
+requestContext.setSecurityContext(oidcSecCtx);
 }
+
 private MultivaluedMap toFormData(ContainerRequestContext 
rc) {
 MultivaluedMap requestState = new MetadataMap();
 if 
(MediaType.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(rc.getMediaType())) {
@@ -74,4 +78,8 @@ public class OidcIdTokenRequestFilter implements 
ContainerRequestFilter {
 public void setConsumer(Consumer consumer) {
 this.consumer = consumer;
 }
+
+public void 

[38/42] cxf git commit: CXF-5855: Introduce support for Server Sent Events. Initial implementation based on Atmosphere

[reta]

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/web-ui/javascripts/highcharts.js
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/web-ui/javascripts/highcharts.js
 
b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/web-ui/javascripts/highcharts.js
new file mode 100644
index 000..327d865
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/web-ui/javascripts/highcharts.js
@@ -0,0 +1,270 @@
+/*
+ Highcharts JS v3.0.1 (2013-04-09)
+
+ (c) 2009-2013 Torstein Hønsi
+
+ License: www.highcharts.com/license
+*/
+(function(){function v(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return 
a}function y(){var a,b=arguments.length,c={},d=function(a,b){var c,h;for(h in 
b)b.hasOwnProperty(h)&&(c=b[h],typeof a!=="object"&&(a={}),a[h]=c& 
c==="object"&(c)!=="[object Array]"& 
c.nodeType!=="number"?d(a[h]||{},c):b[h]);return 
a};for(a=0;a3?c.length%3:0;return
 
e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+Q(a-c).toFixed(f).slice(2):"")}function
 ua(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function 
Ea(a,b){for(var 
c="{",d=!1,e,f,g,h,i,j=[];(c=a.indexOf(c))!==-1;){e=a.slice(0,c);if(d){f=e.split(":");g=f.shift().split(".");i=g.length;e=b;for(h=0;h<
+i;h++)e=e[g[h]];if(f.length)f=f.join(":"),g=/\.([0-9])/,h=N.lang,i=void 
0,/f$/.test(f)?(i=(i=f.match(g))?i[1]:-1,e=Na(e,i,h.decimalPoint,f.indexOf(",")>-1?h.thousandsSep:"")):e=Ua(f,e)}j.push(e);a=a.slice(c+1);c=(d=!d)?"}":"{"}j.push(a);return
 j.join("")}function ib(a,b,c,d){var 
e,c=o(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d=E[jb]&&
+(i.setMilliseconds(0),i.setSeconds(j>=E[Va]?0:k*T(i.getSeconds()/k)));if(j>=E[Va])i[Bb](j>=E[Oa]?0:k*T(i[kb]()/k));if(j>=E[Oa])i[Cb](j>=E[oa]?0:k*T(i[lb]()/k));if(j>=E[oa])i[mb](j>=E[Pa]?1:k*T(i[Qa]()/k));j>=E[Pa]&&(i[Db](j>=E[va]?0:k*T(i[Xa]()/k)),h=i[Ya]());j>=E[va]&&(h-=h%k,i[Eb](h));if(j===E[Wa])i[mb](i[Qa]()-i[nb]()+o(d,1));b=1;h=i[Ya]();for(var
 
d=i.getTime(),m=i[Xa](),l=i[Qa](),i=g?0:(864E5+i.getTimezoneOffset()*6E4)%864E5;dc&&(c=a[b]);return c}function Ga(a,
+b){for(var c in a)a[c]&[c]!==b&[c].destroy&[c].destroy(),delete 
a[c]}function 
Ra(a){$a||($a=U(wa));a&&$a.appendChild(a);$a.innerHTML=""}function qa(a,b){var 
c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;else 

[26/42] cxf git commit: [CXF-6960] Updates to the Swagger link at the services page

[reta]

[CXF-6960] Updates to the Swagger link at the services page


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 6cfb72710d74262f53354b43adcdffc13423e54c
Parents: 9fb6e04
Author: Sergey Beryozkin 
Authored: Mon Jul 25 12:04:10 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 25 12:04:10 2016 +0300

--
 .../src/main/release/samples/jax_rs/spring_boot/README|  5 +
 .../samples/jax_rs/spring_boot_scan/application/README|  5 +
 .../servlet/servicelist/FormattedServiceListWriter.java   | 10 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6cfb7271/distribution/src/main/release/samples/jax_rs/spring_boot/README
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/README 
b/distribution/src/main/release/samples/jax_rs/spring_boot/README
index 21c6e5b..7fdc9c1 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/README
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/README
@@ -25,6 +25,11 @@ open the Swagger-UI page at
 
   
http://localhost:8080/services/helloservice/api-docs?url=/services/helloservice/swagger.json
 
+or access it from the CXF Services page:
+
+  http://localhost:8080/services/helloservice/services
+  and follow a Swagger link.
+
 To run the client from a command line open a new terminal window and run:
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/6cfb7271/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
index a054dc8..baeb48c 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
@@ -38,5 +38,10 @@ open the Swagger-UI page at
 
   
http://localhost:8080/services/helloservice/api-docs?url=/services/helloservice/swagger.json
 
+or access it from the CXF Services page:
+
+  http://localhost:8080/services/helloservice/services
+  and follow a Swagger link.
+
 Check client/README on how to run a command line client.
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/6cfb7271/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
index 7bb75ae..0c25519 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
@@ -20,6 +20,7 @@ package org.apache.cxf.transport.servlet.servicelist;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.URI;
 import java.util.Map;
 
 import org.apache.cxf.Bus;
@@ -175,7 +176,14 @@ public class FormattedServiceListWriter implements 
ServiceListWriter {
 if (bus != null && 
PropertyUtils.isTrue(bus.getProperty("swagger.service.description.available"))) 
{
 String swaggerPath = "swagger.json";
 if 
(PropertyUtils.isTrue(bus.getProperty("swagger.service.ui.available"))) {
-swaggerPath = "api-docs?url=/" + swaggerPath;
+URI uri = URI.create(absoluteURL);
+String schemePath = uri.getScheme() + "://" + uri.getHost() 
++ (uri.getPort() == -1 ? "" : ":" + uri.getPort());
+String relPath = absoluteURL.substring(schemePath.length());
+if (!relPath.endsWith("/")) {
+relPath += "/";
+}
+swaggerPath = "api-docs?url=" + relPath + swaggerPath;
 }
 if (!absoluteURL.endsWith("/")) {
 swaggerPath = "/" + swaggerPath;

[18/42] cxf git commit: Also check the UserInfo for a role in the OidcSecurityContext

[reta]

Also check the UserInfo for a role in the OidcSecurityContext


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

Branch: refs/heads/master-jaxrs-2.1
Commit: b3677b6a9201bd894879d9d06a4c75ac7e310660
Parents: 9e42b9b
Author: Colm O hEigeartaigh 
Authored: Thu Jul 21 10:14:52 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Jul 21 10:14:52 2016 +0100

--
 .../cxf/rs/security/oidc/rp/OidcSecurityContext.java| 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b3677b6a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
index 552a6a1..c5e456c 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
@@ -86,9 +86,15 @@ public class OidcSecurityContext extends 
SimpleSecurityContext implements Securi
 
 @Override
 public boolean isUserInRole(String role) {
-return roleClaim != null && role != null && oidcContext.getIdToken() 
!= null
-&& oidcContext.getIdToken().containsProperty(roleClaim)
-&& role.equals(oidcContext.getIdToken().getProperty(roleClaim));
+
+return roleClaim != null && role != null
+&& (containsClaim(oidcContext.getIdToken(), roleClaim, role) 
+|| containsClaim(oidcContext.getUserInfo(), roleClaim, role));
+}
+
+private boolean containsClaim(AbstractUserInfo userInfo, String claim, 
String claimValue) {
+return userInfo != null && userInfo.containsProperty(claim)
+&& claimValue.equals(userInfo.getProperty(claim));
 }
 
 /**

[41/42] cxf git commit: CXF-5855: Introduce support for Server Sent Events. Initial implementation based on Atmosphere

[reta]

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/web-ui/javascripts/highcharts.js
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/web-ui/javascripts/highcharts.js
 
b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/web-ui/javascripts/highcharts.js
new file mode 100644
index 000..327d865
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/web-ui/javascripts/highcharts.js
@@ -0,0 +1,270 @@
+/*
+ Highcharts JS v3.0.1 (2013-04-09)
+
+ (c) 2009-2013 Torstein Hønsi
+
+ License: www.highcharts.com/license
+*/
+(function(){function v(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return 
a}function y(){var a,b=arguments.length,c={},d=function(a,b){var c,h;for(h in 
b)b.hasOwnProperty(h)&&(c=b[h],typeof a!=="object"&&(a={}),a[h]=c& 
c==="object"&(c)!=="[object Array]"& 
c.nodeType!=="number"?d(a[h]||{},c):b[h]);return 
a};for(a=0;a3?c.length%3:0;return
 
e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+Q(a-c).toFixed(f).slice(2):"")}function
 ua(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function 
Ea(a,b){for(var 
c="{",d=!1,e,f,g,h,i,j=[];(c=a.indexOf(c))!==-1;){e=a.slice(0,c);if(d){f=e.split(":");g=f.shift().split(".");i=g.length;e=b;for(h=0;h<
+i;h++)e=e[g[h]];if(f.length)f=f.join(":"),g=/\.([0-9])/,h=N.lang,i=void 
0,/f$/.test(f)?(i=(i=f.match(g))?i[1]:-1,e=Na(e,i,h.decimalPoint,f.indexOf(",")>-1?h.thousandsSep:"")):e=Ua(f,e)}j.push(e);a=a.slice(c+1);c=(d=!d)?"}":"{"}j.push(a);return
 j.join("")}function ib(a,b,c,d){var 
e,c=o(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d=E[jb]&&
+(i.setMilliseconds(0),i.setSeconds(j>=E[Va]?0:k*T(i.getSeconds()/k)));if(j>=E[Va])i[Bb](j>=E[Oa]?0:k*T(i[kb]()/k));if(j>=E[Oa])i[Cb](j>=E[oa]?0:k*T(i[lb]()/k));if(j>=E[oa])i[mb](j>=E[Pa]?1:k*T(i[Qa]()/k));j>=E[Pa]&&(i[Db](j>=E[va]?0:k*T(i[Xa]()/k)),h=i[Ya]());j>=E[va]&&(h-=h%k,i[Eb](h));if(j===E[Wa])i[mb](i[Qa]()-i[nb]()+o(d,1));b=1;h=i[Ya]();for(var
 
d=i.getTime(),m=i[Xa](),l=i[Qa](),i=g?0:(864E5+i.getTimezoneOffset()*6E4)%864E5;dc&&(c=a[b]);return c}function Ga(a,
+b){for(var c in a)a[c]&[c]!==b&[c].destroy&[c].destroy(),delete 
a[c]}function 
Ra(a){$a||($a=U(wa));a&&$a.appendChild(a);$a.innerHTML=""}function qa(a,b){var 
c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;else 

[22/42] cxf git commit: [CXF-6966] If classloader is null, don't use it for loading the bundles

[reta]

[CXF-6966] If classloader is null, don't use it for loading the bundles


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 949df02a48ca3558786b7fc96de04121e906406a
Parents: b06f6e2
Author: Daniel Kulp 
Authored: Fri Jul 22 11:31:05 2016 -0400
Committer: Daniel Kulp 
Committed: Fri Jul 22 11:31:27 2016 -0400

--
 .../org/apache/cxf/common/i18n/BundleUtils.java | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/949df02a/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java 
b/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
index 9aedfcf..5fdd3b4 100644
--- a/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
@@ -77,13 +77,21 @@ public final class BundleUtils {
 public static ResourceBundle getBundle(Class cls) {
 
 try {
+ClassLoader loader = cls.getClassLoader();
+if (loader == null) {
+return ResourceBundle.getBundle(getBundleName(cls), 
Locale.getDefault());
+}
 return ResourceBundle.getBundle(getBundleName(cls),
 Locale.getDefault(),
-cls.getClassLoader());
+loader);
 } catch (MissingResourceException ex) {
+ClassLoader loader = 
Thread.currentThread().getContextClassLoader();
+if (loader == null) {
+return ResourceBundle.getBundle(getBundleName(cls), 
Locale.getDefault());
+}
 return ResourceBundle.getBundle(getBundleName(cls),
 Locale.getDefault(),
-
Thread.currentThread().getContextClassLoader());
+loader);
 
 }
 }
@@ -98,13 +106,21 @@ public final class BundleUtils {
  */
 public static ResourceBundle getBundle(Class cls, String name) {
 try {
+ClassLoader loader = cls.getClassLoader();
+if (loader == null) {
+return ResourceBundle.getBundle(getBundleName(cls, name), 
Locale.getDefault());
+}
 return ResourceBundle.getBundle(getBundleName(cls, name),
 Locale.getDefault(),
-cls.getClassLoader());
+loader);
 } catch (MissingResourceException ex) {
+ClassLoader loader = 
Thread.currentThread().getContextClassLoader();
+if (loader == null) {
+return ResourceBundle.getBundle(getBundleName(cls, name), 
Locale.getDefault());
+}
 return ResourceBundle.getBundle(getBundleName(cls, name),
 Locale.getDefault(),
-
Thread.currentThread().getContextClassLoader());
+loader);
 
 }
 }

[04/42] cxf git commit: Fixing OIDC test

[reta]

Fixing OIDC test


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 575dc4dda5e6cf038220b0d5807d6d948999cf28
Parents: 31826a3
Author: Sergey Beryozkin 
Authored: Mon Jul 18 14:39:14 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 18 14:39:14 2016 +0300

--
 .../cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/575dc4dd/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
index 3576c9d..a0d82b3 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
@@ -135,7 +135,7 @@ public class ClientCodeRequestFilter implements 
ContainerRequestFilter {
 }
 }
 // Finally compare start URI with the request URI
-return startUri == null || absoluteRequestUri.endsWith(startUri);
+return startUri != null && absoluteRequestUri.endsWith(startUri);
 }
 
 private boolean codeResponseQueryParamsAvailable(MultivaluedMap queries) {

[40/42] cxf git commit: CXF-5855: Introduce support for Server Sent Events. Initial implementation based on Atmosphere

[reta]

http://git-wip-us.apache.org/repos/asf/cxf/blob/e24fb5bc/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/web-ui/javascripts/jquery-1.9.0.min.js
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/web-ui/javascripts/jquery-1.9.0.min.js
 
b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/web-ui/javascripts/jquery-1.9.0.min.js
new file mode 100644
index 000..50d1b22
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/web-ui/javascripts/jquery-1.9.0.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | 
jquery.org/license */(function(e,t){"use strict";function n(e){var 
t=e.length,n=st.type(e);return 
st.isWindow(e)?!1:1===e.nodeType&?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof
 t&>0& in e)}function r(e){var t=Tt[e]={};return 
st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function 
i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof 
n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&if(f&[f]&&(i||c[f].data)||!u||r!==t)return
 
f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof
 n||"function"==typeof 
n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function
 o(e,t,n){if(st.acceptData(e)){var 
r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.conc
 at(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in 
r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete 
r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete 
u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete
 u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var 
i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof
 
r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else
 r=t}return r}function s(e){var t;for(t in 
e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function
 u(){return!0}function l(){return!1}function c(e,t){do 
e=e[t];while(e&&1!==e.nodeType);return e}function 
f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var 
i=!!t.call(e,r,e);return i===n});if(t.nodeType)return 
st.grep(e,function(e){return e===t===n});if("string"==typeof t){var 
r=st.grep(e,function(e){return 
 1===e.nodeType});if(Wt.test(t))return 
st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return 
st.inArray(e,t)>=0===n})}function p(e){var 
t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return
 n}function d(e,t){return 
e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function
 h(e){var t=e.getAttributeNode("type");return 
e.type=(t&)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return 
t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var 
n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function
 y(e,t){if(1===t.nodeType&(e)){var 
n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete 
a.handle,a.events={};for(n in 
s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function
 v(e,t){var 
n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&[st.ex
 pando]){r=st._data(t);for(i in 
r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function
 b(e,n){var 
r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return
 n===t||n&(e,n)?st.merge([e],a):a}function 
x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in 
e)return t;for(var 
n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in 
 e)return t;return r}function w(e,t){return 
e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function 
N(e,t){for(var 

[21/42] cxf git commit: Fixing failing test

[reta]

Fixing failing test


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

Branch: refs/heads/master-jaxrs-2.1
Commit: b06f6e2cb2989cf280f5997645cf13a6bcbe
Parents: b90b956
Author: Colm O hEigeartaigh 
Authored: Fri Jul 22 16:30:18 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Jul 22 16:30:18 2016 +0100

--
 .../java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b06f6e2c/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
--
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
index 20e4492..02de7f8 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
@@ -548,7 +548,7 @@ public class IssueEncryptedUnitTest extends 
org.junit.Assert {
 if (unrestrictedPoliciesInstalled) {
 properties.put("org.apache.wss4j.crypto.merlin.keystore.file", 
"keys/stsstore.jks");
 } else {
-properties.put("org.apache.wss4j.crypto.merlin.keystore.file", 
"restricted/keys/stsstore.jks");
+properties.put("org.apache.wss4j.crypto.merlin.keystore.file", 
"restricted/stsstore.jks");
 }
 
 return properties;

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

[dkulp]

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

Branch: refs/heads/3.1.x-fixes
Commit: 115d5e87c12d7fc01c6a621738c08bea2db410f6
Parents: 97eb4f3
Author: Daniel Kulp 
Authored: Mon Jul 25 16:23:52 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 16:23:52 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/115d5e87/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index aa59f49..8a0f002 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -130,6 +130,7 @@ M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
 M 8f8e587cde7ec97410da6b0586810ccf8f0f3233
 M 8fbf0941ca52aac406b3efcf2e0d73436c72d0f1
 M 91bb2a18f4653f997e455c5089e7a009310591c6
+M 955fd4b7fee79642934a828b7758ce14f783364a
 M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
 M 9b2bda583c09861c693122ab631c4bffa2187ddd
 M 9b816a21d8b85cc051be59a8ab6e968c5d0d

[4/4] cxf git commit: Fixing many checkstyle violations for the sample projects

[dkulp]

Fixing many checkstyle violations for the sample projects


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

Branch: refs/heads/3.1.x-fixes
Commit: 20a4f79a791cbdb5defe6a1c4c30b258c54d0fde
Parents: d2f8f79
Author: reta 
Authored: Tue May 10 21:33:07 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 16:28:33 2016 -0400

--
 .../colocated/client/DispatchSourceClient.java  |  2 +-
 .../rs/service/SampleRestApplication.java   | 34 ++--
 .../registry/eureka/RegistryApplication.java| 18 +++
 .../src/main/java/demo/jaxrs/client/Client.java |  4 +--
 .../java/demo/jaxrs/server/CustomerService.java | 13 
 .../java/demo/jaxrs/server/CustomerService.java | 13 
 .../java/demo/jaxrs/server/CustomerService.java | 13 
 7 files changed, 59 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
--
diff --git 
a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
 
b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
index 181b931..32a2811 100755
--- 
a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
+++ 
b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
@@ -125,7 +125,7 @@ public final class DispatchSourceClient {
 String elementName;
 boolean recording;
 
-public ContentHandler(String namespaceURI, String elementName) {
+ContentHandler(String namespaceURI, String elementName) {
 this.namespaceURI = namespaceURI;
 this.elementName = elementName;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index f622a43..db47c2f 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -36,27 +36,27 @@ public class SampleRestApplication {
 @Bean
 @ExportMetricWriter
 public MetricWriter metricWriter() {
-return new MetricWriter() {
+return new MetricWriter() {
 
-@Override
-public void set(Metric arg0) {
-// TODO Auto-generated method stub
-
-}
+@Override
+public void set(Metric arg0) {
+// TODO Auto-generated method stub
+
+}
 
-@Override
-public void increment(Delta arg0) {
-// TODO Auto-generated method stub
-
-}
+@Override
+public void increment(Delta arg0) {
+// TODO Auto-generated method stub
+
+}
 
-@Override
-public void reset(String arg0) {
-// TODO Auto-generated method stub
-
-}
+@Override
+public void reset(String arg0) {
+// TODO Auto-generated method stub
 
-};
+}
+
+};
 }
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
 

[1/4] cxf git commit: FIx checkstyle issues

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d4aa22c8d -> 20a4f79a7


FIx checkstyle issues

# Conflicts:
#   
distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 97eb4f3e2db0678af3c2ae6cac999ce821574b10
Parents: d4aa22c
Author: Daniel Kulp 
Authored: Mon Jul 25 16:22:51 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 16:23:51 2016 -0400

--
 .../rs/client/SampleRestClientApplication.java  | 29 +++-
 .../rs/service/SampleRestApplication.java   |  2 +-
 .../rs/client/SampleRestClientApplication.java  | 21 --
 .../registry/eureka/RegistryApplication.java|  5 +++-
 4 files changed, 33 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 0fed450..8dbf659 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -31,7 +31,10 @@ import sample.rs.service.HelloService;
 @SpringBootApplication
 @EnableJaxRsWebClient
 @EnableJaxRsProxyClient
-public class SampleRestClientApplication {
+public final class SampleRestClientApplication {
+private SampleRestClientApplication() {
+}
+
 public static void main(String[] args) {
 new SpringApplicationBuilder(SampleRestClientApplication.class)
 .web(false)
@@ -40,24 +43,24 @@ public class SampleRestClientApplication {
 @Bean
 CommandLineRunner initWebClientRunner(final WebClient webClient) {
   
-  return new CommandLineRunner() {
+return new CommandLineRunner() {
 
-@Override
-public void run(String... runArgs) throws Exception {
-
System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class));
-}
-  };
+@Override
+public void run(String... runArgs) throws Exception {
+
System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class));
+}
+};
 }
 @Bean
 CommandLineRunner initProxyClientRunner(final HelloService client) {
   
-  return new CommandLineRunner() {
+return new CommandLineRunner() {
 
-@Override
-public void run(String... runArgs) throws Exception {
-System.out.println(client.sayHello("ApacheCxfProxyUser"));
-}
-  };
+@Override
+public void run(String... runArgs) throws Exception {
+System.out.println(client.sayHello("ApacheCxfProxyUser"));
+}
+};
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index 60ef15e..f622a43 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -60,4 +60,4 @@ public class SampleRestApplication {
 }
 
 
- }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
--
diff --git 

[3/4] cxf git commit: Fix samples checkstyles issues so the builds should be able to finish

[dkulp]

Fix samples checkstyles issues so the builds should be able to finish


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

Branch: refs/heads/3.1.x-fixes
Commit: d2f8f79aee0fb7187a11025209879897ea856f6a
Parents: 115d5e8
Author: Daniel Kulp 
Authored: Fri Jun 10 15:19:53 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 16:25:41 2016 -0400

--
 .../main/java/demo/stream/interceptor/StreamInterceptor.java| 2 +-
 .../jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java| 2 +-
 .../basic_https/src/main/java/httpsdemo/client/Client.java  | 2 +-
 .../src/main/java/demo/jaxrs/client/Client.java | 4 ++--
 .../src/main/java/demo/jaxrs/swagger/server/Server.java | 5 +++--
 .../src/main/java/demo/jaxrs/client/WebSocketTestClient.java| 4 ++--
 .../src/main/java/demo/jaxrs/server/CustomerService.java| 3 +++
 .../src/main/java/demo/jaxrs/server/CustomerService.java| 3 +++
 .../src/main/java/demo/jaxrs/server/CustomerService.java| 3 +++
 .../demo/oauth/server/controllers/MemoryOAuthDataProvider.java  | 3 +--
 .../src/main/java/demo/ws_rm/common/MessageLossSimulator.java   | 2 +-
 11 files changed, 21 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
--
diff --git 
a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
 
b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
index 22b9cb4..e534329 100644
--- 
a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
+++ 
b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
@@ -83,7 +83,7 @@ public class StreamInterceptor extends 
AbstractPhaseInterceptor {
 
 
 private class CachedStream extends CachedOutputStream {
-public CachedStream() {
+CachedStream() {
 super();
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
 
b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
index c1e21d0..4267b84 100644
--- 
a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
+++ 
b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
@@ -90,7 +90,7 @@ public final class Client {
 resolver = new URIResolver(inputFile);
 input = new File(resolver.getURI());
 PostMethod post = new 
PostMethod("http://localhost:9000/customerservice/customers;);
-post.addRequestHeader("Accept" , "text/xml");
+post.addRequestHeader("Accept", "text/xml");
 entity = new FileRequestEntity(input, "text/xml; charset=ISO-8859-1");
 post.setRequestEntity(entity);
 httpclient = new HttpClient();

http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
 
b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
index 9bdb084..7147e2d 100644
--- 
a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
+++ 
b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
@@ -61,7 +61,7 @@ public final class Client {
 DefaultHttpClient httpclient = new DefaultHttpClient();
 
httpclient.getConnectionManager().getSchemeRegistry().register(httpsScheme);
 HttpGet httpget = new HttpGet(BASE_SERVICE_URL + "/123");
-BasicHeader bh = new BasicHeader("Accept" , "text/xml");
+BasicHeader bh = new BasicHeader("Accept", "text/xml");
 httpget.addHeader(bh);
 HttpResponse response = 

cxf git commit: FIx checkstyle issues

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master c515130f8 -> 955fd4b7f


FIx checkstyle issues


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

Branch: refs/heads/master
Commit: 955fd4b7fee79642934a828b7758ce14f783364a
Parents: c515130
Author: Daniel Kulp 
Authored: Mon Jul 25 16:22:51 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 16:22:51 2016 -0400

--
 .../rs/client/SampleRestClientApplication.java  | 29 +++-
 .../rs/service/SampleRestApplication.java   |  2 +-
 .../rs/client/SampleRestClientApplication.java  | 21 --
 .../registry/eureka/RegistryApplication.java|  6 ++--
 4 files changed, 33 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 0fed450..8dbf659 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -31,7 +31,10 @@ import sample.rs.service.HelloService;
 @SpringBootApplication
 @EnableJaxRsWebClient
 @EnableJaxRsProxyClient
-public class SampleRestClientApplication {
+public final class SampleRestClientApplication {
+private SampleRestClientApplication() {
+}
+
 public static void main(String[] args) {
 new SpringApplicationBuilder(SampleRestClientApplication.class)
 .web(false)
@@ -40,24 +43,24 @@ public class SampleRestClientApplication {
 @Bean
 CommandLineRunner initWebClientRunner(final WebClient webClient) {
   
-  return new CommandLineRunner() {
+return new CommandLineRunner() {
 
-@Override
-public void run(String... runArgs) throws Exception {
-
System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class));
-}
-  };
+@Override
+public void run(String... runArgs) throws Exception {
+
System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class));
+}
+};
 }
 @Bean
 CommandLineRunner initProxyClientRunner(final HelloService client) {
   
-  return new CommandLineRunner() {
+return new CommandLineRunner() {
 
-@Override
-public void run(String... runArgs) throws Exception {
-System.out.println(client.sayHello("ApacheCxfProxyUser"));
-}
-  };
+@Override
+public void run(String... runArgs) throws Exception {
+System.out.println(client.sayHello("ApacheCxfProxyUser"));
+}
+};
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index aa8d358..50944a1 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -57,4 +57,4 @@ public class SampleRestApplication {
 }
 
 
- }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
 

[2/2] cxf git commit: Update 3.1.7 release notes

[dkulp]

Update 3.1.7 release notes


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

Branch: refs/heads/3.1.x-fixes
Commit: d4aa22c8dc000946ffb50e7e09156f1c22150e28
Parents: 154d068
Author: Daniel Kulp 
Authored: Mon Jul 25 14:54:43 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 14:54:43 2016 -0400

--
 distribution/src/main/release/release_notes.txt | 133 ---
 1 file changed, 84 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d4aa22c8/distribution/src/main/release/release_notes.txt
--
diff --git a/distribution/src/main/release/release_notes.txt 
b/distribution/src/main/release/release_notes.txt
index 282bc04..a9e1f4b 100644
--- a/distribution/src/main/release/release_notes.txt
+++ b/distribution/src/main/release/release_notes.txt
@@ -1,8 +1,8 @@
-Apache CXF 3.1.6 Release Notes
+Apache CXF 3.1.7 Release Notes
 
 1. Overview
 
-The 3.1.6 version of Apache CXF is a significant new version of CXF 
+The 3.1.7 version of Apache CXF is a significant new version of CXF 
 that provides several new features and enhancements.  
 
 New features include: 
@@ -25,7 +25,7 @@ http://cxf.apache.org/docs/31-migration-guide.html
 for further information and requirements for upgrading from earlier
 versions of CXF.
 
-3.1.6 fixes over 45 JIRA issues reported by users and the community.
+3.1.7 fixes over 75 JIRA issues reported by users and the community.
 
 
 
@@ -71,60 +71,95 @@ to 3.1.
 
 7. Specific issues, features, and improvements fixed in this version
 
+
+
 ** Bug
-* [CXF-6435] - Support base64 for attachment encoding in CXF
-* [CXF-6492] - AbstractHTTPDestination class incorrectly assume only one 
empty space after "Basic" in Authorization header value. 
-* [CXF-6743] - Inconsistent versions of jax-rs specs can lead to OSGi pain
-* [CXF-6764] - Should add RI JAXB Namespacemapper support
-* [CXF-6769] - Underscores in values of FIQL search expressions are 
incorrectly escaped
-* [CXF-6770] - PrettyLoggingFilter not working well when using 
camel-cxf-transport
-* [CXF-6772] - HttpClientPolicy browserType is reported as BrowserType 
header 
-* [CXF-6781] - InternalContextUtils should bak all the data from the input 
stream before send back partialResponse
-* [CXF-6785] - AbstractHTTPDestination should handle the case when 
pathInfo of HttpServletRequest is null 
-* [CXF-6787] - not sufficient WadlGenerator presence detection
-* [CXF-6793] - InvocationCallback doesn't try to get response class type
-* [CXF-6795] - WS-Discovery add support for discovery on localhost
-* [CXF-6799] - java.lang.ClassCastException: 
sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl cannot be cast to 
java.lang.reflect.TypeVariable
-* [CXF-6805] - cxf-rt-transports-http adds Content-Type header to GET 
request
-* [CXF-6806] - don't mark the optional "encoding" parameter as required 
for cxf-java2wadl-plugin
-* [CXF-6809] - SAMLRequest ID must not start with a Number
-* [CXF-6810] - JAX-RS Client one way requests do not work with 
jms-transport
-* [CXF-6812] - WebTargetImpl should always check if client is closed first
-* [CXF-6813] - MediaTypeHeaderProvider doesn't check the illegal media 
type string like "s//tt;type=text/plain"
-* [CXF-6819] - ConfigurationImp returns wrong value for 
isRegistered(Object obj)
-* [CXF-6820] - LinkBuilderImpl#link() doesn't throw exception for invalid 
input
-* [CXF-6823] - Duplicate injectedProviders in ProviderFactory impacting 
throughput by ~30%
-* [CXF-6828] - [OAuth] AbstractGrant set wrong value(scope) for audience
-* [CXF-6832] - Attachment content-disposition modification-date not parsed 
correctly
-* [CXF-6838] - AsyncResponse doesn't use 204 when body is empty
+* [CXF-6454] - Orphaned JMS connections created in endless loop
+* [CXF-6463] - AbstractHTTPDestination.cacheInput() throws 
NullPointerException if HttpServletRequest returns null for getInputStream()
+* [CXF-6510] - LoggingOutInterceptor: formatLoggingMessage method is not 
used in every case
+* [CXF-6646] - CXF 3.x WSRM message may not be retrieved from database
+* [CXF-6729] -  Version 1 NewCookie is not compliant with RFC 2109
+* [CXF-6841] - Fix documentation cxf-rt-rs-http-sc => cxf-rt-rs-http-sci
+* [CXF-6842] - Unwrap exception nested with WebApplicationException
+* [CXF-6845] - Some methods in MessageUtils prone to NPE
+* [CXF-6850] - javax.ws.rs.core.Request implementation doesn't match 

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

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e6336c897 -> d4aa22c8d


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

Branch: refs/heads/3.1.x-fixes
Commit: 154d06822014f5cc0607cbf12706a31f88577191
Parents: e6336c8
Author: Daniel Kulp 
Authored: Mon Jul 25 10:05:29 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 14:47:32 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/154d0682/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 014811a..aa59f49 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -148,6 +148,7 @@ M e578ea946aa13177adef98727e3e4606652ffc76
 M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
 M e92e57c1f14de911cd2315a907443c79e91a94de
 M ed9298066428c0dfc4590a556876d696a4ba13c0
+M f462c797eab75e9b6c6c352b4baeb84429866068
 M f9a42a528f4edfa7bcc62d5885eebaeb25224cec
 M fa973bd7ab43099151f83beea351b80c7140eaab
 M fd6689948bc7ad153ccfd7f64554eafbf64b20d6

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes dc0667de2 -> 5d1128840


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

Branch: refs/heads/3.0.x-fixes
Commit: 5d1128840ed7f8f3f1f8a8cc0f79fda684294178
Parents: dc0667d
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 18:22:57 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 18:22:57 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/5d112884/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c91bb39..3206feb 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1044,6 +1044,7 @@ B e5a5d5b64015faffa3479ac009631c66f9f56036
 B e5bd083e9b206e7b516329ab7316c3bd025143db
 B e5d98fd24b545920f2453e94a56cd9690582af59
 B e6085587cd0380b0e64346af53ac07e49734c8db
+B e6336c897a723b3925d3670b159a47fd33b0
 B e652e672f718f5b361801a623731950ae90988e1
 B e6db5c58964c1c93bd65e8cc9dab24fe2cb25fc5
 B e6fc7e50266d45c8b5afb002abdc44b69585cc69

cxf git commit: WSS4J update

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 1e12811be -> dc0667de2


WSS4J update


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

Branch: refs/heads/3.0.x-fixes
Commit: dc0667de26905acc709a738ae2e95548ff910edd
Parents: 1e12811
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 18:22:20 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 18:22:20 2016 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/dc0667de/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 1084817..846dc26 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -164,7 +164,7 @@
 4.4.1
 3.1.4
 1.6.3
-2.0.8
+2.0.9
 2.11.0
 2.6.0
 2.2.1

cxf git commit: WSS4J update

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d530fc8b9 -> e6336c897


WSS4J update


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

Branch: refs/heads/3.1.x-fixes
Commit: e6336c897a723b3925d3670b159a47fd33b0
Parents: d530fc8
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 18:21:49 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 18:21:49 2016 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e6336c89/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7b2c9b5..fe293c6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,7 +156,7 @@
 4.4.1
 3.1.4
 1.6.3
-2.1.6
+2.1.7
 2.11.0
 2.6.0
 2.2.1

cxf git commit: FIx checkstyle

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 74f9284a5 -> 1e12811be


FIx checkstyle


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

Branch: refs/heads/3.0.x-fixes
Commit: 1e12811be326e2aedab734a7702c51b6f8898cf8
Parents: 74f9284
Author: Daniel Kulp 
Authored: Mon Jul 25 12:28:40 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 12:28:40 2016 -0400

--
 .../src/main/java/demo/jaxrs/swagger/server/Server.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1e12811b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
index d03938f..40c18e2 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -22,8 +22,10 @@ package demo.jaxrs.swagger.server;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class Server {
-
+public final class Server {
+private Server() {
+}
+
 
 public static void main(String args[]) throws Exception {
 ApplicationContext appctxt = 

cxf git commit: Update 3.0.10 release notes

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes f86fa5bbb -> 74f9284a5


Update 3.0.10 release notes


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

Branch: refs/heads/3.0.x-fixes
Commit: 74f9284a5d97ba17daa70ca1962a699a4269dabb
Parents: f86fa5b
Author: Daniel Kulp 
Authored: Mon Jul 25 11:41:22 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 11:41:22 2016 -0400

--
 distribution/src/main/release/release_notes.txt | 77 
 1 file changed, 47 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/74f9284a/distribution/src/main/release/release_notes.txt
--
diff --git a/distribution/src/main/release/release_notes.txt 
b/distribution/src/main/release/release_notes.txt
index 8553713..7cfed00 100644
--- a/distribution/src/main/release/release_notes.txt
+++ b/distribution/src/main/release/release_notes.txt
@@ -1,4 +1,4 @@
-Apache CXF 3.0.9 Release Notes
+Apache CXF 3.0.10 Release Notes
 
 1. Overview
 
@@ -22,7 +22,7 @@ Users are encourage to review the migration guide at:
 http://cxf.apache.org/docs/30-migration-guide.html
 for further information and requirements for upgrading from 2.7.x.
 
-3.0.9 fixes over 24 JIRA issues reported by users and the community.
+3.0.10 fixes over 42 JIRA issues reported by users and the community.
 
 
 
@@ -68,36 +68,53 @@ for caveats when upgrading from CXF 2.7.x to 3.0.0
 
 
 ** Bug
-* [CXF-6492] - AbstractHTTPDestination class incorrectly assume only one 
empty space after "Basic" in Authorization header value. 
-* [CXF-6764] - Should add RI JAXB Namespacemapper support
-* [CXF-6769] - Underscores in values of FIQL search expressions are 
incorrectly escaped
-* [CXF-6772] - HttpClientPolicy browserType is reported as BrowserType 
header 
-* [CXF-6787] - not sufficient WadlGenerator presence detection
-* [CXF-6793] - InvocationCallback doesn't try to get response class type
-* [CXF-6799] - java.lang.ClassCastException: 
sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl cannot be cast to 
java.lang.reflect.TypeVariable
-* [CXF-6805] - cxf-rt-transports-http adds Content-Type header to GET 
request
-* [CXF-6806] - don't mark the optional "encoding" parameter as required 
for cxf-java2wadl-plugin
-* [CXF-6810] - JAX-RS Client one way requests do not work with 
jms-transport
-* [CXF-6812] - WebTargetImpl should always check if client is closed first
-* [CXF-6823] - Duplicate injectedProviders in ProviderFactory impacting 
throughput by ~30%
-* [CXF-6828] - [OAuth] AbstractGrant set wrong value(scope) for audience
-* [CXF-6832] - Attachment content-disposition modification-date not parsed 
correctly
-* [CXF-6838] - AsyncResponse doesn't use 204 when body is empty
+* [CXF-6463] - AbstractHTTPDestination.cacheInput() throws 
NullPointerException if HttpServletRequest returns null for getInputStream()
+* [CXF-6510] - LoggingOutInterceptor: formatLoggingMessage method is not 
used in every case
+* [CXF-6646] - CXF 3.x WSRM message may not be retrieved from database
+* [CXF-6729] -  Version 1 NewCookie is not compliant with RFC 2109
+* [CXF-6842] - Unwrap exception nested with WebApplicationException
+* [CXF-6845] - Some methods in MessageUtils prone to NPE
+* [CXF-6850] - javax.ws.rs.core.Request implementation doesn't match 
Accept-Encoding: *  for  any encoding value
+* [CXF-6851] - JAXRS 2 Feature not supported on server side?
+* [CXF-6854] - Application subclass can't be injected into an application 
lass field
+* [CXF-6855] - ElementClass annotation is ignored on JAX-RS service 
interface when generating the WADL
+* [CXF-6867] - Envelope and Body element prefixes changed when processing 
messages without headers
+* [CXF-6868] - empty Authorization header result in server error
+* [CXF-6878] - Protect against other exception during consuming left-over 
data
+* [CXF-6883] - Crypto caching issues in the WS-Security code
+* [CXF-6884] - Don't include Signature/EncryptedKey Elements if there are 
no references to be signed/encrypted
+* [CXF-6886] - CXF 3.x WSRM attachments are not retransmitted
+* [CXF-6890] - "afirmative" is mispelled in debug output
+* [CXF-6891] - IOUtils.isEmpty() doesn't reinclude byte in stream.
+* [CXF-6901] - UriBuilder may lose resolved query templates
+* [CXF-6906] - UriBuilder ignores a query component if URI contains 
templates
+* [CXF-6917] - SuperClass and Interface's Annotations are ignored when the 

[03/14] cxf git commit: [CXF-6900] Get Colm's tests working....

[dkulp]

[CXF-6900] Get Colm's tests working


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

Branch: refs/heads/3.0.x-fixes
Commit: 40428e414a8a724b10ea68b9d7a06e656fd1b867
Parents: 807d2ac
Author: Daniel Kulp 
Authored: Tue May 17 12:13:14 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:16:42 2016 -0400

--
 .../cxf/binding/soap/saaj/SAAJStreamWriter.java   |  4 
 .../apache/cxf/binding/soap/saaj/ParseBodyTest.java   | 14 ++
 2 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/40428e41/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 14b5c2e..d29276c 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -52,6 +52,9 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
 if (namespace != null 
 && 
namespace.equals(part.getEnvelope().getElementName().getURI())) {
 adjustPrefix((SOAPElement)nd2, pfx);
+if ("Envelope".equals(nd2.getLocalName())) {
+adjustPrefix(part.getEnvelope().getHeader(), pfx);
+}
 }
 } catch (SOAPException e) {
 //ignore, fallback
@@ -146,6 +149,7 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
 el = ((SOAPElement)cur).addChildElement(local, "", "");
 } else {
 el = ((SOAPElement)cur).addChildElement(local, pfx == null 
? "" : pfx, ns);
+adjustPrefix((SOAPElement)el, pfx);
 }
 cur.removeChild(el);
 return el;

http://git-wip-us.apache.org/repos/asf/cxf/blob/40428e41/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
--
diff --git 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index bcdb6f9..1f6eeb4 100644
--- 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -30,6 +30,7 @@ import javax.xml.soap.SOAPMessage;
 import javax.xml.soap.SOAPPart;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
 import org.w3c.dom.Document;
@@ -39,6 +40,7 @@ import org.apache.cxf.helpers.DOMUtils.NullResolver;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.staxutils.StaxSource;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.junit.Assert;
 import org.junit.Test;
@@ -87,26 +89,30 @@ public class ParseBodyTest extends Assert {
 
 // TODO - See CXF-6900
 @Test
-@org.junit.Ignore
 public void testReadSOAPFault() throws Exception {
 InputStream inStream = 
getClass().getResourceAsStream("soap12-fault.xml");
 Document doc = StaxUtils.read(inStream);
-
+
 SoapMessage msg = new SoapMessage(new MessageImpl());
 Exchange ex = new ExchangeImpl();
 ex.setInMessage(msg);
 
 SOAPMessage saajMsg = 
MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL).createMessage();
 SOAPPart part = saajMsg.getSOAPPart();
-part.setContent(new DOMSource(doc));
+SAAJStreamWriter writer = new SAAJStreamWriter(part);
+StaxUtils.copy(doc, writer);
+//Source s = new StaxSource(StaxUtils.createXMLStreamReader(doc));
+//part.setContent(s);
 saajMsg.saveChanges();
-
+
 msg.setContent(SOAPMessage.class, saajMsg);
 doc = part;
 
 // System.out.println("OUTPUT: " + StaxUtils.toString(doc));
 
 byte[] docbytes = getMessageBytes(doc);
+
+// System.out.println("OUTPUT: " + new String(docbytes));
 XMLStreamReader reader = StaxUtils.createXMLStreamReader(new 

[02/14] cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

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

Branch: refs/heads/3.0.x-fixes
Commit: 807d2ac923b6e7d0797a96ae40ba6b9dbc796e60
Parents: ff07f49
Author: Daniel Kulp 
Authored: Mon Jul 25 10:15:29 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:16:26 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/807d2ac9/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 135b556..844fc5f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -54,6 +54,7 @@ B 0ff6a3c8609507351d29903d04198fd71b650ae5
 B 10ee2d5b3f76f020d0463fb5fbe7194b43965d22
 B 11243052a6e1656657776bc3a0c586cba962c49f
 B 11ea395d0fa226c040f4ca3c4c6114a90ce34e06
+B 11f3e36e1af5d979a84040f79a8e9cb0f6840d9d
 B 1214338f24a3a7973f2bd72ca01fc57644bcc45a
 B 12206c314d34f2e210f7292fcb7a3e894fafd4e7
 B 12225d4f560c30839fd8f2ecb6657663d7559a27
@@ -64,6 +65,7 @@ B 1308529e8b6a325143fea8256c98e37f79016170
 B 1319cddeeca993b6c6f67a392a4807fc46e2e329
 B 131c1febfce98364435a3dc5567be89188ee1bda
 B 131c3fdba9c4825b739adc3d149d0297175b8a86
+B 13303df9a7dbdd3954599ddc56ce757b61e31404
 B 13b9b012a31fdf1a7e35757a336fecc3c688848e
 B 13dfe0f9fcaa0aee4c603072436d85861a0ab734
 B 13e01e23ea87ea5b06953f18bef4b173fca55b4d
@@ -91,6 +93,7 @@ B 1960703149a11052490cf16ec3682408470298f9
 B 19cbe748cf0753671e50a643d845a5700c53777b
 B 1a5708e21708a9ed96991cd56ff89b3fd4eac15a
 B 1a8fd7c02bc6a620e276086b665d430217116767
+B 1b30b3c83db2ae9a236d4c91285bae161fcc6f4f
 B 1b3f01b4f640beea1f1247416ad9891e615f816c
 B 1b7d4d1488db897ac7c824288556bed2df851309
 B 1c17a94b0adf40fd6193b9fcf2a87ce9a686a131
@@ -173,6 +176,7 @@ B 2ec875978a50cd34d07bd7d3bbfc8583fd30250b
 B 2f0b3e38212674883d610cfcfbd76b901bd3d997
 B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f
 B 2f5f034b8e8361aed103de5bd7fa7526847ac690
+B 2f881786004132611d6b0d52969828899c0f9ca9
 B 2fccfdcdbcd3a8bb8ea740eda499b48b74dbaf65
 B 2fd8103535c1246a3a243e0fd7bcea86947e6b14
 B 2fe88ec153b6193a8c80f7c1226db19600e0839a
@@ -190,6 +194,7 @@ B 32c0aca5fa2a6473dc3e3257fcaaef6efea66874
 B 33083c0682d2bdf2f42df7f4021d18bd7ccc34a4
 B 3309231e467225b18b24d90d77153a0c572a17e0
 B 33c7781f4f847431a7bbdc9335657d3281cd525e
+B 340a1305bfeb84d9ce8248b2e6efea5327bbe615
 B 34425010f5c6e50255bcc188db5bd6dd5bed3b97
 B 34e083dd1c4cccf4bda941dace30134dad546ab0
 B 3506302369c0a28647056c1da469bd9844e45826
@@ -198,8 +203,10 @@ B 354ac95b70a98b4f2e8f9f33c534b3e885e9a935
 B 358589c33f44d747f5a924f0b1cdedfcb7018a22
 B 35c7bb64928cf92da260c588b6d4ea9d60ccb2f3
 B 35da295262a43a59717b6f17e739335a04d197ca
+B 35f01c94841870afa8331e0591aec8a3bc4ca94d
 B 362437e222ea79e92078323d865fb0b2d7195610
 B 3634fd60f85ae12f9de68c69cb2d15a38dac772c
+B 36d2bf61511d1921a38d065eb474be802f2f949e
 B 36dc41e1b2bddd02def5dafbafd4a86443ab5e30
 B 36ebac7b230f8b48d098c580b6774a91f1844854
 B 36fcf426a4946f57b051ce7a388c7190fc97aebd
@@ -226,16 +233,19 @@ B 3aaf7d75c873c990d8e86d27e37f03c47e074175
 B 3aec3e286e4732918589c239ea1b8f7e1d3a9836
 B 3af4374ddb16ccf86195d64cb2a39fd4d65d43f1
 B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
+B 3b2ce76de26f35cf782f2607ca65f715a2caae50
 B 3c2092b369f06d4f71134397240092a659bcbca1
 B 3c9806ce95374d7e0879b735e8c5f9d640a53efe
 B 3ca7722d98bf22f47aab57a3856edfb83074bab8
 B 3cf195384c2175085c7840dc4469837a347c7d0a
 B 3d373ea991a8415f6161468f36947143411e2cf1
+B 3d6ecbda539fa23d9239b7d3ea291590b8a8331f
 B 3d747fa0847db2798f6662a2540d4f3a79d83edd
 B 3e393ef377af21a0385cb0943aae248a22d1fc1f
 B 3ea1c784f248e29dcda46b16b82ad0e923c4b6e1
 B 3ec5957b01821138129cc29acb88430fa278d28e
 B 3ee69e9404d3ffed74e84b223d7d284c081f7fb4
+B 3f90fa6a7adb9c3311663424950fa352d7d5bdbb
 B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97
 B 40e31a9f14bb9e494c9240463e17ed232e201876
 B 411dff107d089001ffa836bc196f91ab873f76cf
@@ -285,6 +295,7 @@ B 494ff7640d78b1667547c8aacfc1d517fff00ef8
 B 49829a180d3924f3dfc8ecf41ac904e8da020ba1
 B 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c
 B 4a749e745ee64b3d9ee09eb9e7a35039127d6f40
+B 4b15b8a49c1ea75c346ea4a53e3110db7edbd127
 B 4b44512d8c3fe76620dbac37d220038435c75ba5
 B 4b4a5151c83113bb53d65e0304b8c9fee524d28a
 B 4b577dc98cc61e4aead2f0bdff6d017c8a7679df
@@ -297,11 +308,13 @@ B 42361582ab5e785d5ae616af9e58a40c9828
 B 4d0c6df1e561f5e6d118430349a09360c9dd754f
 B 4d49814ba85310599ee76e41742208383f3f6450
 B 4da4d2300433e7e115f095becb1149b22ceb31ca
+B 4db1a9e0dafe99d147727431bc3cb8450501fd95
 B 4def8e9dbf56b0bab43afcb6b805ee945c31b03c
 B 

[01/14] cxf git commit: Update cxf-utils.js to throw the onerror handler on timeout This closes #126

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 8bfa04d6d -> f86fa5bbb


Update cxf-utils.js to throw the onerror handler on timeout
This closes #126


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

Branch: refs/heads/3.0.x-fixes
Commit: ff07f49a22db975e1f00a751b54b395b1fec4408
Parents: 8bfa04d
Author: Jeroen van der Last 
Authored: Tue Apr 5 16:30:58 2016 +0200
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:11:57 2016 -0400

--
 .../src/main/resources/org/apache/cxf/javascript/cxf-utils.js   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ff07f49a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
--
diff --git 
a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
 
b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
index a084d05..8c9f451 100644
--- 
a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
+++ 
b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
@@ -745,6 +745,9 @@ function org_apache_cxf_client_request(url, requestXML, 
method, sync, headers)
this.req.onreadystatechange = function() {
requester.onReadyState();
}
+   this.req.onerror = function() {
+   requester.onReadyState();
+   }
 
// NOTE: we do not call the onerror callback for a synchronous error
// at request time. We let the request object throw as it will.
@@ -929,7 +932,7 @@ function org_apache_cxf_client_onReadyState() {
return;
}
if (this.onerror != null) {
-   this.onerror("Could not handle 
content of response.");
+   this.onerror(this, "Could not 
handle content of response.");
return;
}
}

[12/14] cxf git commit: [CXF-6966] If classloader is null, don't use it for loading the bundles

[dkulp]

[CXF-6966] If classloader is null, don't use it for loading the bundles


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

Branch: refs/heads/3.0.x-fixes
Commit: c82c0e90dde47fb8c6329b1ee8eac3dae043ed75
Parents: 0d7ec24
Author: Daniel Kulp 
Authored: Fri Jul 22 11:31:05 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:29:52 2016 -0400

--
 .../org/apache/cxf/common/i18n/BundleUtils.java | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c82c0e90/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java 
b/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
index 9aedfcf..5fdd3b4 100644
--- a/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
@@ -77,13 +77,21 @@ public final class BundleUtils {
 public static ResourceBundle getBundle(Class cls) {
 
 try {
+ClassLoader loader = cls.getClassLoader();
+if (loader == null) {
+return ResourceBundle.getBundle(getBundleName(cls), 
Locale.getDefault());
+}
 return ResourceBundle.getBundle(getBundleName(cls),
 Locale.getDefault(),
-cls.getClassLoader());
+loader);
 } catch (MissingResourceException ex) {
+ClassLoader loader = 
Thread.currentThread().getContextClassLoader();
+if (loader == null) {
+return ResourceBundle.getBundle(getBundleName(cls), 
Locale.getDefault());
+}
 return ResourceBundle.getBundle(getBundleName(cls),
 Locale.getDefault(),
-
Thread.currentThread().getContextClassLoader());
+loader);
 
 }
 }
@@ -98,13 +106,21 @@ public final class BundleUtils {
  */
 public static ResourceBundle getBundle(Class cls, String name) {
 try {
+ClassLoader loader = cls.getClassLoader();
+if (loader == null) {
+return ResourceBundle.getBundle(getBundleName(cls, name), 
Locale.getDefault());
+}
 return ResourceBundle.getBundle(getBundleName(cls, name),
 Locale.getDefault(),
-cls.getClassLoader());
+loader);
 } catch (MissingResourceException ex) {
+ClassLoader loader = 
Thread.currentThread().getContextClassLoader();
+if (loader == null) {
+return ResourceBundle.getBundle(getBundleName(cls, name), 
Locale.getDefault());
+}
 return ResourceBundle.getBundle(getBundleName(cls, name),
 Locale.getDefault(),
-
Thread.currentThread().getContextClassLoader());
+loader);
 
 }
 }

[13/14] cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

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

Branch: refs/heads/3.0.x-fixes
Commit: 47dc676dc35f5db4648a11a55b85d2ca95f1b2be
Parents: c82c0e9
Author: Daniel Kulp 
Authored: Mon Jul 25 10:30:19 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:30:19 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/47dc676d/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 844fc5f..c91bb39 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -6,6 +6,7 @@ B 013eb89d0453bf897d219b762e50ab5232f6ca00
 B 015419bf394e219cbb07ca7706b4bd8e2942e856
 B 015d7a6dde4e201aaf8eaa90343b6ca9a20f6856
 B 01956cc9af68f80d4f12018a3779c12f36d5308e
+B 01bf5f841d27d94485018912a575e4d9b50caab9
 B 033815a0e180b8e1abfcc0c1acdbeb0219ad256d
 B 035154fb466fb9c833804d1bc747804df9e9992b
 B 0384a69b7bc0b4846e89469f974ace534e7734d7
@@ -18,14 +19,17 @@ B 04932cc6e66a6bca0ae25f2bf68e97f6241736eb
 B 04960b3a04731e3e0f030c17ac25f154defb5568
 B 04f0ef2e32f55d51f14cfc6d7a14616b62a6cce5
 B 05a7ad32b06dc800d31cffbb39df5be16f847849
+B 05e838902732c879e6a9415f11624d1581b5271e
 B 0642440cd3114db0ca86ca99987617d98634697f
 B 06e74f175c476c82c773c4ac31cf656ef593d424
+B 06fbd75b77597a6b413c72ab845578ba03bf3a21
 B 07297f3c75c3d16a6d81b423d545ababd714f5b9
 B 073529c953211160cf9392334a1f9546cb4e0a45
 B 07c6322a52c12077567a48c9a87e832ea9362886
 B 08246e10e00396811bddf64a3e131b580afb12db
 B 0848bdb305b5d6e542da417ff5fd9e7c9ace5381
 B 084ad67a648c736e911fa0a419d6e5cca345c1b2
+B 087f7390c71a8a1b07b0a30e9091d290ac75811e
 B 088dcdf8c7a3626adf650e80b98a9efd51d48653
 B 08d98fbb13440de2da3b19915d8dfe21531cb284
 B 091f8bef03e671f151e21a890159e5033b1c5d86
@@ -40,19 +44,25 @@ B 0ba19453f17be19aa2e46848b1908f776a6abb64
 B 0befccd8a70d7896d9210f554e19375e5d8cc168
 B 0c0555f4ac850ec8e38302d73207170affe4376a
 B 0c542f82652995db0d7ce6681dafab086c178b13
+B 0c5d2b9fc11c4e2a0590dc3f3f64612be8dda074
 B 0cad194ee50841f1c740097430780044fa1e9eaf
 B 0cdd2c03fed0ca51386312e1772ac49edccf1ae3
 B 0ceb6a1d93195310c3a9325bf80e4c88d6920755
 B 0d0bc938103b0ea9311c3b73f6c385aa3e12260c
 B 0d2a6ccabc752708484e2b2c44deb5b48e71b76e
 B 0d72569d3fdd360e60d1fcea59c354b754f2a386
+B 0dd29509e42fc412ec0cf214e66885d26da9850e
 B 0ddd071dd1e7c475d8a0463564a991d62c96e3b0
 B 0de0309f28e1543660c763c158f4353d6d2189be
 B 0e639399027b2b43ece5b21f73effa6381a5bf0c
+B 0ea13a8e17b88fd4cdf7273b55115c1e48908bfc
+B 0f66cb025baf40cf84207c87f2428c9942fc8328
 B 0f88d05f0a6b04701f01075703a9da532d53c4d5
+B 0fee635ae9a9e6ddcb74485e2a5eb3ce24005892
 B 0ff6a3c8609507351d29903d04198fd71b650ae5
 B 10ee2d5b3f76f020d0463fb5fbe7194b43965d22
 B 11243052a6e1656657776bc3a0c586cba962c49f
+B 117ca31a8479e9f4ca7f37cbfe516f74984a30cc
 B 11ea395d0fa226c040f4ca3c4c6114a90ce34e06
 B 11f3e36e1af5d979a84040f79a8e9cb0f6840d9d
 B 1214338f24a3a7973f2bd72ca01fc57644bcc45a
@@ -61,6 +71,7 @@ B 12225d4f560c30839fd8f2ecb6657663d7559a27
 B 12b8e711d2068044caa9ceb57e3fe038e4e92cfc
 B 12c325a12e897b3fac6afbd9ec2fe34dcaaa9d02
 B 12d7631bb74f7034c2635f1f253eef79b0fae0ca
+B 12f1ce562973e791a38f1495b2c81dc03cb59e9e
 B 1308529e8b6a325143fea8256c98e37f79016170
 B 1319cddeeca993b6c6f67a392a4807fc46e2e329
 B 131c1febfce98364435a3dc5567be89188ee1bda
@@ -73,13 +84,16 @@ B 105de684d0a266cbbfbb415e09121412d577
 B 1487fccd43c3bcc463f12cdc1573cde68323f8b6
 B 14ed2e2c44b6da7641c95fb57212f8b5a5e77f3d
 B 159089a4c0bcf4d30ed819f064f0e31c6c3dc2af
+B 15ce3e7fb4db8eafca9a263349bc94f1e9516f7f
 B 15e4db9688617af6764f82c234e5a9582692a6e2
 B 15ebdfafcd3c54406bcb7ca3405f8aa4fe13ae35
 B 161e10bb2d87573974b8a1748f023c47ebbe5d49
 B 162bbb5ea63cfeb6c258d750627c77c9e694f928
+B 163e1d2361643251b31b6fdf7def0b52542577dd
 B 165ebbf9d0b5541b6abdd5c140cfe921d92cf869
 B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373
 B 16d789c4a913e0cac51bcf929331abe84010ce1e
+B 1700674150b8619c99ae02fdbd374b08d1855c29
 B 1770c6f6cdfd8ddcbefb36b25f7313edd7fd927e
 B 17d710cdb3b4d3cd5d07321051ac42753c4817b2
 B 1805027c9ce9925fb875e92fc5314aa826632151
@@ -101,6 +115,7 @@ B 1c7a34e313062edff246c2c1943d43b71b0f8aa7
 B 1d29dfaa8e686570c1b2ec2da4c31ba380e0b9b0
 B 1d29e0af16d1714a44d0144f4b0563d423eb16c0
 B 1d9e79ef36bf14e25d7cd2cccb0d804a048aef64
+B 1da1293953e95d756406d8eab9c99a2de459c1ab
 B 1db0f0bbe8435bc0c081627857d5047ec8ee7f55
 B 1dea643baf6193e9a94abe8b1900c139bf273121
 B 1e82efba0035a15afe84ada2d3fd0791733800a7
@@ -108,13 +123,16 @@ B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f
 B 

[14/14] cxf git commit: Fix compile failures after merge

[dkulp]

Fix compile failures after merge


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

Branch: refs/heads/3.0.x-fixes
Commit: f86fa5bbb23690695f518c61ce236aa32b2d2198
Parents: 47dc676
Author: Daniel Kulp 
Authored: Mon Jul 25 10:39:39 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 11:30:23 2016 -0400

--
 .../interceptor/AbstractMessageResponseTimeInterceptor.java   | 3 ++-
 .../interceptor/AbstractMessageResponseTestBase.java  | 3 ++-
 .../cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java  | 3 ---
 .../test/java/org/apache/cxf/systest/ws/fault/FaultTest.java  | 7 ---
 4 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f86fa5bb/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
--
diff --git 
a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
 
b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
index 76bb5e9..c421cb1 100644
--- 
a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
+++ 
b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
@@ -38,6 +38,7 @@ import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.service.Service;
+import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.OperationInfo;
 
 public abstract class AbstractMessageResponseTimeInterceptor extends 
AbstractPhaseInterceptor {
@@ -172,7 +173,7 @@ public abstract class 
AbstractMessageResponseTimeInterceptor extends AbstractPha
 }
 
 protected ObjectName getOperationCounterName(Exchange ex, ObjectName 
sericeCounterName) {
-BindingOperationInfo bop = ex.getBindingOperationInfo();
+BindingOperationInfo bop = ex.get(BindingOperationInfo.class);
 OperationInfo opInfo = bop == null ? null : bop.getOperationInfo();
 if (opInfo != null) {
 ObjectName o = opInfo.getProperty("javax.management.ObjectName", 
ObjectName.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f86fa5bb/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
--
diff --git 
a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
 
b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
index 15ffa71..f31a0cc 100644
--- 
a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
+++ 
b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
@@ -30,6 +30,7 @@ import 
org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
+import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.easymock.EasyMock;
@@ -133,7 +134,7 @@ public class AbstractMessageResponseTestBase extends Assert 
{
 protected void setupOperationForMessage() {
 OperationInfo op = EasyMock.createMock(OperationInfo.class);
 BindingOperationInfo bop = 
EasyMock.createMock(BindingOperationInfo.class);
-EasyMock.expect(exchange.getBindingOperationInfo()).andReturn(bop);
+
EasyMock.expect(exchange.get(BindingOperationInfo.class)).andReturn(bop);
 EasyMock.expect(bop.getOperationInfo()).andReturn(op);
 EasyMock.expect(op.getName()).andReturn(OPERATION_NAME);
 EasyMock.expect(op.getProperty("javax.management.ObjectName", 
ObjectName.class)).andReturn(null).anyTimes();

http://git-wip-us.apache.org/repos/asf/cxf/blob/f86fa5bb/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
--
diff --git 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
index 879ec0d..71e7bb3 100644
--- 

[07/14] cxf git commit: Updates to get the transformation stuff to workaround all the bugs/junk in SAAJ for the faults

[dkulp]

Updates to get the transformation stuff to workaround all the bugs/junk in SAAJ 
for the faults

# Conflicts:
#   
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
#   
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java


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

Branch: refs/heads/3.0.x-fixes
Commit: c372fb70c18f63cb17cef66a962e4ab90ee89875
Parents: 8cd54b2
Author: Daniel Kulp 
Authored: Fri May 20 11:31:00 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:19:34 2016 -0400

--
 .../staxutils/OverlayW3CDOMStreamWriter.java|  6 ++
 .../cxf/staxutils/W3CDOMStreamWriter.java   |  4 +
 .../cxf/binding/soap/saaj/SAAJStreamWriter.java | 78 ++--
 .../ws/security/wss4j/WSS4JFaultCodeTest.java   |  2 +
 4 files changed, 69 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c372fb70/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java 
b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
index d30bf4f..475973a 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
@@ -25,6 +25,7 @@ import java.util.List;
 import javax.xml.stream.XMLStreamException;
 
 import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.Text;
@@ -53,6 +54,11 @@ public class OverlayW3CDOMStreamWriter extends 
W3CDOMStreamWriter {
 public OverlayW3CDOMStreamWriter(Document doc, Element e) {
 super(doc, e);
 }
+public OverlayW3CDOMStreamWriter(Document doc, DocumentFragment frag) {
+super(doc, frag);
+isOverlaid = false;
+}
+
 
 @Override
 protected void createAndAddElement(String prefix, String local, String 
namespace) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/c372fb70/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java 
b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
index 6903c4c..353da70 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
@@ -60,6 +60,10 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
 this.document = frag.getOwnerDocument();
 currentNode = frag;
 }
+public W3CDOMStreamWriter(Document document, DocumentFragment frag) {
+this.document = document;
+currentNode = frag;
+}
 
 public W3CDOMStreamWriter(Element e) {
 this.document = e.getOwnerDocument();

http://git-wip-us.apache.org/repos/asf/cxf/blob/c372fb70/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 393a553..185079b 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -21,11 +21,13 @@ package org.apache.cxf.binding.soap.saaj;
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPBody;
 import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPFault;
 import javax.xml.soap.SOAPHeader;
 import javax.xml.soap.SOAPPart;
 
+import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -36,7 +38,10 @@ import static 
org.apache.cxf.binding.soap.saaj.SAAJUtils.adjustPrefix;
 
 public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
 private final SOAPPart part;
-
+private final SOAPEnvelope envelope;
+private String uri;
+
+
 public SAAJStreamWriter(SOAPPart part) {
 super(part);
 this.part = part;
@@ -44,20 +49,47 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
 if (nd == null) {
 isOverlaid = 

[10/14] cxf git commit: Fix UDP tests on my mac

[dkulp]

Fix UDP tests on my mac


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

Branch: refs/heads/3.0.x-fixes
Commit: 1dbc471fa2d1872570053b02bc904c76f58b87a1
Parents: cc929d4
Author: Daniel Kulp 
Authored: Tue Jun 7 13:52:42 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:25:14 2016 -0400

--
 .../cxf/transport/udp/UDPTransportTest.java | 24 ++--
 1 file changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1dbc471f/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
--
diff --git 
a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
 
b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
index fea6ce1..9c0052c 100644
--- 
a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
+++ 
b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
@@ -22,12 +22,13 @@ package org.apache.cxf.transport.udp;
 import java.net.NetworkInterface;
 import java.util.Enumeration;
 
+import javax.jws.WebService;
+
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.hello_world.Greeter;
-import org.apache.hello_world.GreeterImpl;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -40,6 +41,23 @@ public class UDPTransportTest extends 
AbstractBusClientServerTestBase {
 static final String PORT = allocatePort(UDPTransportTest.class);
 private static Server server; 
 
+@WebService(serviceName = "SOAPService", 
+endpointInterface = "org.apache.hello_world.Greeter", 
+targetNamespace = "http://apache.org/hello_world;)
+static class GreeterImpl implements Greeter {
+private String myName = "defaultGreeter";
+GreeterImpl() {
+}
+public String greetMe(String me) {
+return "Hello " + me;
+}
+public String sayHi() {
+return "Bonjour from " + myName;
+}
+public void pingMe() {
+}
+}
+
 
 @BeforeClass
 public static void setUpBeforeClass() throws Exception {
@@ -53,7 +71,9 @@ public class UDPTransportTest extends 
AbstractBusClientServerTestBase {
 
 @AfterClass 
 public static void shutdown() throws Exception {
-server.stop();
+if (server != null) {
+server.stop();
+}
 }
 
 @Test

[05/14] cxf git commit: Fix unused imports

[dkulp]

Fix unused imports


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

Branch: refs/heads/3.0.x-fixes
Commit: 12049c41f9d3f157bf1f9d9ecd301d7d3a6a8e48
Parents: c65d8ee
Author: Daniel Kulp 
Authored: Tue May 17 12:24:18 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:16:50 2016 -0400

--
 .../test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java  | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/12049c41/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
--
diff --git 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index 1f6eeb4..c6b2087 100644
--- 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -30,7 +30,6 @@ import javax.xml.soap.SOAPMessage;
 import javax.xml.soap.SOAPPart;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
 import org.w3c.dom.Document;
@@ -40,7 +39,6 @@ import org.apache.cxf.helpers.DOMUtils.NullResolver;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.staxutils.StaxSource;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.junit.Assert;
 import org.junit.Test;

[11/14] cxf git commit: Cache the object names to help performance

[dkulp]

Cache the object names to help performance

# Conflicts:
#   
rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
#   
rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java


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

Branch: refs/heads/3.0.x-fixes
Commit: 0d7ec2470afdb9413dfd2cb37b49ae1d9e07d6ff
Parents: 1dbc471
Author: Daniel Kulp 
Authored: Mon Jun 20 12:24:42 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:27:35 2016 -0400

--
 .../AbstractMessageResponseTimeInterceptor.java | 70 
 .../AbstractMessageResponseTestBase.java| 16 -
 2 files changed, 56 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0d7ec247/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
--
diff --git 
a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
 
b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
index 92f9dc4..76bb5e9 100644
--- 
a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
+++ 
b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
@@ -113,34 +113,44 @@ public abstract class 
AbstractMessageResponseTimeInterceptor extends AbstractPha
 protected ObjectName getServiceCounterName(Exchange ex) {
 Bus bus = ex.get(Bus.class);
 StringBuilder buffer = new StringBuilder();
+ObjectName serviceCounterName = null;
 if (ex.get("org.apache.cxf.management.service.counter.name") != null) {
 
buffer.append((String)ex.get("org.apache.cxf.management.service.counter.name"));
+try {
+serviceCounterName = new ObjectName(buffer.toString());
+} catch (MalformedObjectNameException e) {
+LOG.log(Level.WARNING, "CREATE_COUNTER_OBJECTNAME_FAILED", e);
+}
 } else {
 Service service = ex.get(Service.class);
 Endpoint endpoint = ex.get(Endpoint.class);
-
-String serviceName = "\"" + 
escapePatternChars(service.getName().toString()) + "\"";
-String portName = "\"" + 
endpoint.getEndpointInfo().getName().getLocalPart() + "\"";
-
-buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":");
-buffer.append(ManagementConstants.BUS_ID_PROP + "=" + bus.getId() 
+ ",");
-Message message = ex.getOutMessage();
-if (isClient(message)) {
-buffer.append(ManagementConstants.TYPE_PROP + "=" + 
Counter.PERFORMANCE_COUNTER
-  + ".Client,");
-} else {
-buffer.append(ManagementConstants.TYPE_PROP + "=" + 
Counter.PERFORMANCE_COUNTER
-  + ".Server,");
+
+serviceCounterName = 
(ObjectName)endpoint.get("javax.management.ObjectName");
+if (serviceCounterName == null) {
+String serviceName = "\"" + 
escapePatternChars(service.getName().toString()) + "\"";
+String portName = "\"" + 
endpoint.getEndpointInfo().getName().getLocalPart() + "\"";
+
+buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":");
+buffer.append(ManagementConstants.BUS_ID_PROP + "=" + 
bus.getId() + ",");
+Message message = ex.getOutMessage();
+if (isClient(message)) {
+buffer.append(ManagementConstants.TYPE_PROP + "=" + 
Counter.PERFORMANCE_COUNTER
+  + ".Client,");
+} else {
+buffer.append(ManagementConstants.TYPE_PROP + "=" + 
Counter.PERFORMANCE_COUNTER
+  + ".Server,");
+}
+buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + 
serviceName + ",");
+
+buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + 
portName);
+
+try {
+serviceCounterName = new ObjectName(buffer.toString());
+endpoint.put("javax.management.ObjectName", 
serviceCounterName);
+} catch (MalformedObjectNameException e) {
+LOG.log(Level.WARNING, 

[04/14] cxf git commit: [CXF-6900] More SAAJ fixes

[dkulp]

[CXF-6900] More SAAJ fixes


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

Branch: refs/heads/3.0.x-fixes
Commit: c65d8ee6d0961320006aadb0c3524a8f43448641
Parents: 40428e4
Author: Daniel Kulp 
Authored: Tue May 17 13:26:31 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:16:45 2016 -0400

--
 .../apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java   |  2 +-
 .../apache/cxf/binding/soap/saaj/SAAJStreamWriter.java| 10 ++
 .../cxf/ws/security/wss4j/AbstractPolicySecurityTest.java |  5 ++---
 .../cxf/ws/security/wss4j/AbstractSecurityTest.java   |  8 
 .../cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java  |  3 +++
 5 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c65d8ee6/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java 
b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
index 74de7a3..d30bf4f 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
@@ -38,9 +38,9 @@ import org.apache.cxf.common.util.StringUtils;
  * location, it will just walk into it instead of creating a new element
  */
 public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
+protected boolean isOverlaid = true;
 
 List isOverlaidStack = new LinkedList();
-boolean isOverlaid = true;
 Boolean textOverlay;
 
 public OverlayW3CDOMStreamWriter(Document document) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/c65d8ee6/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index d29276c..393a553 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -40,6 +40,10 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
 public SAAJStreamWriter(SOAPPart part) {
 super(part);
 this.part = part;
+Node nd = part.getFirstChild();
+if (nd == null) {
+isOverlaid = false;
+}
 }
 public SAAJStreamWriter(SOAPPart part, Element current) {
 super(part, current);
@@ -69,8 +73,14 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
 if ("Envelope".equals(local)) {
 setChild(adjustPrefix(part.getEnvelope(), prefix), false);
 adjustPrefix(part.getEnvelope().getHeader(), prefix);
+adjustPrefix(part.getEnvelope().getBody(), prefix);
+
part.getEnvelope().removeChild(part.getEnvelope().getHeader());
+
part.getEnvelope().removeChild(part.getEnvelope().getBody());
 return;
 } else if ("Body".equals(local)) {
+if (part.getEnvelope().getBody() == null) {
+part.getEnvelope().addBody();
+}
 setChild(adjustPrefix(part.getEnvelope().getBody(), 
prefix), false);
 return;
 } else if ("Header".equals(local)) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/c65d8ee6/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
--
diff --git 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
index 7d62cfe..a0864f3 100644
--- 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
+++ 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.Executor;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.soap.Node;
-import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.transform.OutputKeys;
 import 

[06/14] cxf git commit: Formatting issues in impl.vm. Closes #88

[dkulp]

Formatting issues in impl.vm. Closes #88


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

Branch: refs/heads/3.0.x-fixes
Commit: 8cd54b29524d47efa58ef21152bc105119702d22
Parents: 12049c4
Author: Dustin R. Heart 
Authored: Thu Sep 10 18:14:55 2015 -0700
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:17:21 2016 -0400

--
 .../org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8cd54b29/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
--
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
index e24f7cd..d9fe1b7 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
@@ -64,12 +64,12 @@ public class ${implName} implements $intf.Name {
 
 #foreach ($method in $intf.Methods)
 /* (non-Javadoc)
- * @see $intf.PackageName.$intf.Name#${method.Name}(#foreach ($parameter 
in $method.Parameters)$parameter.ClassName  $parameter.Name #if ($velocityCount 
!= $method.getParameters().size()),#end)#end*
+ * @see $intf.PackageName.$intf.Name#${method.Name}(#foreach ($parameter 
in $method.Parameters)$parameter.ClassName $parameter.Name#if ($velocityCount 
!= $method.getParameters().size()), #end#end)*
  */
 #if ($mark-generated == "true")
 @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = 
"$currentdate")
 #end
-public $method.return.ClassName 
${method.Name}(#if($method.ParameterListWithoutAnnotation.size() == 
0))#end#if($method.ParameterListWithoutAnnotation.size() != 0)#foreach($param 
in 
${method.ParameterListWithoutAnnotation})$param#end)#end#if($method.Exceptions.size()
 > 0) throws #foreach($exception in $method.Exceptions)$exception.ClassName 
#if($velocityCount != $method.Exceptions.size()),#end #end #end { 
+public $method.return.ClassName 
${method.Name}(#if($method.ParameterListWithoutAnnotation.size() == 
0))#end#if($method.ParameterListWithoutAnnotation.size() != 0)#foreach($param 
in ${method.ParameterListWithoutAnnotation})$param#if($velocityCount != 
$method.ParameterListWithoutAnnotation.size()) 
#end#end)#end#if($method.Exceptions.size() > 0) throws #foreach($exception in 
$method.Exceptions)$exception.ClassName#if($velocityCount != 
$method.Exceptions.size()), #end #end #end { 
 #if ($method.Async)
return null;
/* not called */

[09/14] cxf git commit: Support @Policy annotation on impl methods. Fixes the Policy annotation test Colm added

[dkulp]

Support @Policy annotation on impl methods. Fixes the Policy annotation test 
Colm added


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

Branch: refs/heads/3.0.x-fixes
Commit: cc929d442fde164932a0e25571689accbad72015
Parents: 35b808c
Author: Daniel Kulp 
Authored: Tue May 24 13:30:21 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Jul 25 10:23:47 2016 -0400

--
 .../java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java | 5 ++---
 .../cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java  | 4 +++-
 .../cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java | 4 +++-
 .../test/java/org/apache/cxf/systest/ws/fault/FaultTest.java| 2 --
 4 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cc929d44/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
index b35295e..c9e2e32 100644
--- 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
+++ 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
@@ -91,9 +91,8 @@ public class PolicyAnnotationListener implements 
FactoryBeanListener {
 if (ep.getEndpointInfo().getInterface() != null) {
 addPolicies(factory, ep, cls);
 
-// this will allow us to support annotations in 
Implementations, but only for
-// class level annotations.  Method level annotations are not 
currently supported
-// for implementations.  The call has been moved here so that 
the ServiceInfo
+// this will allow us to support annotations in 
Implementations.
+// The call has been moved here so that the ServiceInfo
 // policy stuff is loaded before jaxws factory calls the 
PolicyEngineImpl
 addEndpointImplPolicies(factory, ep, implCls);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/cc929d44/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
--
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index e93d790..872076e 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -84,6 +84,7 @@ import org.apache.cxf.resource.ResourceManager;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.ServiceImpl;
 import org.apache.cxf.service.ServiceModelSchemaValidator;
+import org.apache.cxf.service.factory.FactoryBeanListener;
 import org.apache.cxf.service.factory.FactoryBeanListener.Event;
 import org.apache.cxf.service.factory.ServiceConstructionException;
 import org.apache.cxf.service.factory.SimpleMethodDispatcher;
@@ -355,7 +356,8 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 }
 
 public void updateBindingOperation(BindingOperationInfo boi) {
-//nothing
+Method m = getMethodDispatcher().getMethod(boi);
+sendEvent(FactoryBeanListener.Event.BINDING_OPERATION_CREATED, 
boi.getBinding(), boi, m);
 }
 
 public Endpoint createEndpoint(EndpointInfo ei) throws EndpointException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/cc929d44/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java
index 0d3d6a7..fbbf957 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java
@@ -30,7 +30,9 @@ import org.example.contract.doubleit.DoubleItFault;
 import org.example.contract.doubleit.DoubleItPortType;
 
 @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt;, 
- 

cxf-dosgi git commit: [CXF-5107] Remove old intentmanager methods

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 9d31b7e9f -> 70abcac2f


[CXF-5107] Remove old intentmanager methods


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

Branch: refs/heads/master
Commit: 70abcac2fc819aae466801ef9535fa778c9919d8
Parents: 9d31b7e
Author: Christian Schneider 
Authored: Mon Jul 25 15:47:32 2016 +0200
Committer: Christian Schneider 
Committed: Mon Jul 25 15:47:32 2016 +0200

--
 .../cxf/dosgi/common/intent/IntentManager.java  | 15 ++---
 .../intent/impl/DefaultIntentsHandler.java  | 49 ---
 .../common/intent/impl/IntentManagerImpl.java   | 64 +---
 .../handlers/rest/ProviderIntentHandler.java| 43 -
 .../cxf/dosgi/dsw/handlers/rest/RsProvider.java |  4 +-
 .../cxf/dosgi/dsw/handlers/ws/WsProvider.java   | 15 ++---
 6 files changed, 13 insertions(+), 177 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/70abcac2/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java 
b/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
index f854691..512b617 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
@@ -22,24 +22,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.aries.rsa.spi.IntentUnsatisfiedException;
-import org.apache.cxf.endpoint.AbstractEndpointFactory;
-
 public interface IntentManager {
 String INTENT_NAME_PROP = "org.apache.cxf.dosgi.IntentName";
 
 Set getExported(Map sd);
 
 Set getImported(Map sd);
-
-String[] assertAllIntentsSupported(Set reuiredIntents);
-
-void applyIntents(AbstractEndpointFactory factory, //
-  Set requiredIntents, //
-  IntentHandler ... handlers)
-throws IntentUnsatisfiedException;
 
+List getRequiredIntents(Set requiredIntents);
+
  List getIntents(Class type, List intents);
+
  T getIntent(Class type, List intents);
-List getIntents(Set requiredIntents);
+
 }

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/70abcac2/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/DefaultIntentsHandler.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/DefaultIntentsHandler.java
 
b/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/DefaultIntentsHandler.java
deleted file mode 100644
index 8242829..000
--- 
a/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/DefaultIntentsHandler.java
+++ /dev/null
@@ -1,49 +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.dosgi.common.intent.impl;
-
-import org.apache.cxf.binding.BindingConfiguration;
-import org.apache.cxf.databinding.DataBinding;
-import org.apache.cxf.dosgi.common.intent.IntentHandler;
-import org.apache.cxf.endpoint.AbstractEndpointFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DefaultIntentsHandler implements IntentHandler {
-static final Logger LOG = LoggerFactory.getLogger(IntentManagerImpl.class);
-
-@Override
-public boolean apply(AbstractEndpointFactory factory, String intentName, 
Object intent) {
-String prefix = "Applying intent: " + intentName + " via ";
-if (intent instanceof DataBinding) {
-DataBinding dataBinding = (DataBinding) intent;
-LOG.info(prefix + "data binding: " + dataBinding);
-

cxf-dosgi git commit: [CXF-5107] SSL example and support for Conduit features

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 6cb485884 -> 9d31b7e9f


[CXF-5107] SSL example and support for Conduit features


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

Branch: refs/heads/master
Commit: 9d31b7e9fab82aead91eb591e7ed55d52816f169
Parents: 6cb4858
Author: Christian Schneider 
Authored: Mon Jul 25 14:43:31 2016 +0200
Committer: Christian Schneider 
Committed: Mon Jul 25 14:43:31 2016 +0200

--
 .../cxf/dosgi/common/intent/IntentManager.java  |   5 +
 .../cxf/dosgi/common/intent/IntentProvider.java |  28 --
 .../intent/impl/DefaultIntentsHandler.java  |   6 --
 .../common/intent/impl/IntentManagerImpl.java   |  67 +++--
 parent/pom.xml  |   3 +-
 .../cxf/dosgi/dsw/handlers/rest/RsProvider.java |  59 +---
 .../rest/provider/RsProviderCustomTest.java |  46 +
 .../handlers/rest/simple/RsProviderTest.java|  12 +--
 .../cxf/dosgi/dsw/handlers/ws/WsProvider.java   |  40 +++-
 .../ws/PojoConfigurationTypeHandlerTest.java|   3 +
 samples/ssl/README.md   |  40 
 samples/ssl/client/pom.xml  |  46 +
 .../dosgi/samples/ssl/client/EchoClient.java|  42 +
 samples/ssl/impl/pom.xml|  45 +
 .../samples/ssl/impl/GreeterServiceImpl.java|  42 +
 samples/ssl/interface/bnd.bnd   |   1 +
 samples/ssl/interface/pom.xml   |  45 +
 .../cxf/dosgi/samples/ssl/EchoService.java  |  23 +
 .../apache/cxf/dosgi/samples/ssl/SslIntent.java |  94 +++
 samples/ssl/keystores/client.jks| Bin 0 -> 2816 bytes
 samples/ssl/keystores/client.p12| Bin 0 -> 2410 bytes
 samples/ssl/keystores/keystore.jks  | Bin 0 -> 2815 bytes
 samples/ssl/org.ops4j.pax.web.cfg   |  11 +++
 samples/ssl/pom.xml |  54 +++
 24 files changed, 620 insertions(+), 92 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/9d31b7e9/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java 
b/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
index fbbdcd3..f854691 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.dosgi.common.intent;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -37,4 +38,8 @@ public interface IntentManager {
   Set requiredIntents, //
   IntentHandler ... handlers)
 throws IntentUnsatisfiedException;
+
+ List getIntents(Class type, List intents);
+ T getIntent(Class type, List intents);
+List getIntents(Set requiredIntents);
 }

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/9d31b7e9/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentProvider.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentProvider.java 
b/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentProvider.java
deleted file mode 100644
index 10a970a..000
--- 
a/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentProvider.java
+++ /dev/null
@@ -1,28 +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.dosgi.common.intent;
-
-import java.util.List;
-
-/**
- * Allows to provide a list of intents under one name
- */
-public 

cxf-fediz git commit: Updating Apache DS

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 1a26bcf4f -> 34a38476c


Updating Apache DS


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

Branch: refs/heads/master
Commit: 34a38476cc17877c7ef9f7a7179c84d3d3b103e9
Parents: 1a26bcf
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 13:02:56 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 13:02:56 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/34a38476/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 33edc57..645b5bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 
 
 
-2.0.0-M22
+2.0.0-M23
 1.54
 1.1.1
 3.4

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

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d646d4d9f -> 8bfa04d6d


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

Branch: refs/heads/3.0.x-fixes
Commit: da19598de506b0df8186660bae1adaa33233144a
Parents: 75680bb
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 11:34:22 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 11:34:22 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/da19598d/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d764415..135b556 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -777,6 +777,7 @@ B ca1f38bcbcc5097af7e537173cacb24806b4b490
 B cab2ad9c5027ae9574de002ddc70908156e6f722
 B cb19d05174a3bd078b391c4f6c151ee6e34e2956
 B cb2160fee6782b8638477ae7af5ad4cd82d6b88f
+B cb3e85497e96020bec19a7edb9ae3b02b277bbc9
 B cb5211ec61d20e91b920b3c60f34b3e50f571c42
 B cbcdc107da88f28e772f3a943013743a033781de
 B cc0eb7f8e1ac8bb9e62f757bba7aca3d10ceb7da
@@ -909,6 +910,7 @@ B eee2a947d867c403c212677cf942b3d07fa06fd7
 B efac3c9e56559370e2d8c8733f7886f83662b4e4
 B effcaf3f6cfb4b3287d683285592f2693af42b29
 B f0200ef2cc049726798ce53b11bd61d4cb33d45a
+B f09bcb55c8841279dbb4c64d777f7e1c50a98196
 B f10bfbdb56a0d24ea4f712a48eec24812c71c718
 B f116182ef7a5a4bcc38086f62d654b8355279f5b
 B f183b9f00a596ff645b30fdc0e4954f0bf26c80f
@@ -942,6 +944,7 @@ B f831e9f5ee56bff9e4472782300f9558ba234f80
 B f859eade61005a93f4954b9763b0217e7bf3b15d
 B f8b8025bcf1b4b74712782db73dc2715aeae70fe
 B f8df21ed3d17539a81c9cdfdc4222d13ffbe62cd
+B f9272b565c61ea255a88f12ee2ffa66305233d4f
 B f942e1e15d6c4fa83e305eb7452dca8fc80cbdcf
 B f94861bd6745e92bc1f69acaa907761f3bcc0613
 B f96f50e5afc6a45406558b4dca06c2258797facf
@@ -1167,6 +1170,7 @@ M 94585ae070e62d08f0e064df8176fbdbdf1bb37b
 M 94d6eba32c31e686def306f20b48ccc60d383fad
 M 953d23f38ddfe044a4dff4783498ebe5d68d76c1
 M 96f736726871ac7cb69d04a8527c806e887d7636
+M 97fc24b158d3deb18a388a49b01b3436e6c7b1b7
 M 982bdbc9dc2127906d0a1ca06ae181c87c38bbfa
 M 98a578dbf4b7e19c4555bd2011f24c650d0f54c0
 M 98f65f2911e063e70e864e7614b062cc124a0f9d

[3/4] cxf git commit: Fixing merge

[coheigea]

Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: d8aeb09df0cb7ac547b95af77ce821431433b030
Parents: da19598
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 12:40:05 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 12:40:05 2016 +0100

--
 .../ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d8aeb09d/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index 28d574f..8e20e58 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -27,6 +27,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Logger;
 
 import javax.security.auth.callback.CallbackHandler;
 import javax.xml.namespace.QName;
@@ -41,11 +43,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.apache.cxf.binding.soap.SoapMessage;
-<<< HEAD
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
-===
->>> 97fc24b... Removing "TODO" code due to impending WSS4J release
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.MapNamespaceContext;
@@ -81,13 +80,11 @@ import 
org.apache.cxf.ws.security.wss4j.policyvalidators.UsernameTokenPolicyVali
 import org.apache.cxf.ws.security.wss4j.policyvalidators.WSS11PolicyValidator;
 import 
org.apache.cxf.ws.security.wss4j.policyvalidators.X509TokenPolicyValidator;
 import org.apache.wss4j.common.crypto.Crypto;
-<<< HEAD
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.JasyptPasswordEncryptor;
-===
->>> 97fc24b... Removing "TODO" code due to impending WSS4J release
 import org.apache.wss4j.common.crypto.PasswordEncryptor;
 import org.apache.wss4j.common.ext.WSSecurityException;
+import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
@@ -113,6 +110,8 @@ import org.apache.wss4j.policy.model.Wss11;
  * 
  */
 public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
+
+private static final Logger LOG = 
LogUtils.getL7dLogger(PolicyBasedWSS4JInInterceptor.class);
 
 /**
  * 

[4/4] cxf git commit: Removing test that fails with JDK6

[coheigea]

Removing test that fails with JDK6


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

Branch: refs/heads/3.0.x-fixes
Commit: 8bfa04d6d36cd8e3ea5699dddcd8fc70943b517a
Parents: d8aeb09
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 12:40:10 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 12:40:10 2016 +0100

--
 .../https/clientauth/ClientAuthTest.java| 42 
 1 file changed, 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8bfa04d6/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
--
diff --git 
a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
 
b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
index 643be9d..d889103 100644
--- 
a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
+++ 
b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
@@ -19,16 +19,10 @@
 
 package org.apache.cxf.systest.https.clientauth;
 
-import java.io.FileInputStream;
 import java.net.URL;
-import java.security.KeyStore;
 
 import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -253,42 +247,6 @@ public class ClientAuthTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
-@org.junit.Test
-public void testSSLConnectionUsingJavaAPIs() throws Exception {
-URL service = new URL("https://localhost:; + PORT);
-HttpsURLConnection connection = (HttpsURLConnection) 
service.openConnection();
-
-connection.setHostnameVerifier(new DisableCNCheckVerifier());
-
-SSLContext sslContext = SSLContext.getInstance("TLS");
-
-URL trustStore = 
ClientAuthTest.class.getResource("../../../../../../keys/Truststore.jks");
-KeyStore ts = KeyStore.getInstance("JKS");
-FileInputStream trustStoreInputStream = new 
FileInputStream(trustStore.getPath());
-ts.load(trustStoreInputStream, "password".toCharArray());
-trustStoreInputStream.close();
-
-TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
-tmf.init(ts);
-
-URL keyStore = 
ClientAuthTest.class.getResource("../../../../../../keys/Morpit.jks");
-KeyStore ks = KeyStore.getInstance("JKS");
-FileInputStream keyStoreInputStream = new 
FileInputStream(keyStore.getPath());
-ks.load(keyStoreInputStream, "password".toCharArray());
-keyStoreInputStream.close();
-
-KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX");
-kmf.init(ks, "password".toCharArray());
-
-sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), new 
java.security.SecureRandom());
-
-connection.setSSLSocketFactory(sslContext.getSocketFactory());
-
-connection.connect();
-
-connection.disconnect();
-}
-
 private static final class DisableCNCheckVerifier implements 
HostnameVerifier {
 
 @Override

[2/4] cxf git commit: Removing "TODO" code due to impending WSS4J release

[coheigea]

Removing "TODO" code due to impending WSS4J release

# Conflicts:
#   
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java


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

Branch: refs/heads/3.0.x-fixes
Commit: 75680bba22b12ad1a429dfd98d400bf20747617f
Parents: d646d4d
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 11:33:29 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 11:34:22 2016 +0100

--
 .../wss4j/PolicyBasedWSS4JInInterceptor.java| 78 ++--
 1 file changed, 6 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/75680bba/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index 6eaaee5..28d574f 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -27,8 +27,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
-import java.util.logging.Logger;
 
 import javax.security.auth.callback.CallbackHandler;
 import javax.xml.namespace.QName;
@@ -43,8 +41,11 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.apache.cxf.binding.soap.SoapMessage;
+<<< HEAD
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
+===
+>>> 97fc24b... Removing "TODO" code due to impending WSS4J release
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.MapNamespaceContext;
@@ -80,11 +81,13 @@ import 
org.apache.cxf.ws.security.wss4j.policyvalidators.UsernameTokenPolicyVali
 import org.apache.cxf.ws.security.wss4j.policyvalidators.WSS11PolicyValidator;
 import 
org.apache.cxf.ws.security.wss4j.policyvalidators.X509TokenPolicyValidator;
 import org.apache.wss4j.common.crypto.Crypto;
+<<< HEAD
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.JasyptPasswordEncryptor;
+===
+>>> 97fc24b... Removing "TODO" code due to impending WSS4J release
 import org.apache.wss4j.common.crypto.PasswordEncryptor;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
@@ -111,8 +114,6 @@ import org.apache.wss4j.policy.model.Wss11;
  */
 public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
 
-private static final Logger LOG = 
LogUtils.getL7dLogger(PolicyBasedWSS4JInInterceptor.class);
-
 /**
  * 
  */
@@ -129,73 +130,6 @@ public class PolicyBasedWSS4JInInterceptor extends 
WSS4JInInterceptor {
 }
 }
 
-/**
- * TODO - This method can be removed when WSS4J 2.1.7 is released - see 
WSS-582
- * 
- * Load a Crypto instance. Firstly, it tries to use the 
cryptoPropertyRefId tag to retrieve
- * a Crypto object via a custom reference Id. Failing this, it tries to 
load the crypto
- * instance via the cryptoPropertyFile tag.
- *
- * @param requestData the RequestData object
- * @return a Crypto instance to use for Encryption creation/verification
- */
-@Override
-protected Crypto loadCrypto(
-String cryptoPropertyFile,
-String cryptoPropertyRefId,
-RequestData requestData
-) throws WSSecurityException {
-Object mc = requestData.getMsgContext();
-Crypto crypto = null;
-
-//
-// Try the Property Ref Id first
-//
-String refId = getString(cryptoPropertyRefId, mc);
-if (refId != null) {
-crypto = cryptos.get(refId);
-if (crypto == null) {
-Object obj = getProperty(mc, refId);
-if (obj instanceof Properties) {
-crypto = CryptoFactory.getInstance((Properties)obj,
-   
Loader.getClassLoader(CryptoFactory.class),
-   
getPasswordEncryptor(requestData));
-   

cxf git commit: [CXF-6960] Minor update to SwaggerUi resource

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 7c594df67 -> c515130f8


[CXF-6960] Minor update to SwaggerUi resource


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

Branch: refs/heads/master
Commit: c515130f8ca8bf415bb3e1267517ceaea5676f78
Parents: 7c594df
Author: Sergey Beryozkin 
Authored: Mon Jul 25 13:49:55 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 25 13:49:55 2016 +0300

--
 .../src/main/release/samples/jax_rs/description_swagger2/pom.xml | 2 +-
 .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c515130f/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
index 9afb7c3..867ac0c 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -64,7 +64,7 @@
 
   org.webjars
   swagger-ui
-  2.1.0
+  2.1.8-M1
 
 
 org.apache.cxf

http://git-wip-us.apache.org/repos/asf/cxf/blob/c515130f/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 bf6440d..8bc8afa 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
@@ -279,11 +279,11 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 }
 @Path("api-docs")
 public static class SwaggerUIService {
-private static final String FAVICON_ICO = "favicon.ico";
+private static final String FAVICON = "favicon";
 @GET
 @Path("{resource:.*}")
 public Response getResource(@Context UriInfo uriInfo, 
@PathParam("resource") String resourcePath) {
-if (FAVICON_ICO.equals(resourcePath)) {
+if (resourcePath.contains(FAVICON)) {
 return Response.status(404).build();
 }
 if (StringUtils.isEmpty(resourcePath) || "/".equals(resourcePath)) 
{

cxf git commit: Updating swagger-jaxrs version

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 97fc24b15 -> 2d564d063


Updating swagger-jaxrs version


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

Branch: refs/heads/3.1.x-fixes
Commit: 2d564d063fd3633e59df16cfb02d580483525e76
Parents: 97fc24b
Author: Sergey Beryozkin 
Authored: Mon Jul 25 13:38:50 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 25 13:40:02 2016 +0300

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2d564d06/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e9711ec..7b2c9b5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -151,7 +151,7 @@
 1.3.1.RELEASE
 spring-test
 1.3.13
-1.5.8
+1.5.9
 1.7
 4.4.1
 3.1.4

[1/2] cxf git commit: Updating swagger-jaxrs version

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 9b2bda583 -> 7c594df67


Updating swagger-jaxrs version


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

Branch: refs/heads/master
Commit: f18d41271f26192f5a4d38f68d955f34ccb503da
Parents: 6cfb727
Author: Sergey Beryozkin 
Authored: Mon Jul 25 13:38:50 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 25 13:38:50 2016 +0300

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f18d4127/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ff3ffd8..f925cab 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -154,7 +154,7 @@
 1.3.1.RELEASE
 spring-test
 1.3.13
-1.5.8
+1.5.9
 1.7
 4.4.1
 3.1.4

[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

[sergeyb]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


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

Branch: refs/heads/master
Commit: 7c594df67a7a15be3dff65b189981353c3d908ea
Parents: f18d412 9b2bda5
Author: Sergey Beryozkin 
Authored: Mon Jul 25 13:39:10 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 25 13:39:10 2016 +0300

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7c594df6/parent/pom.xml
--

[3/4] cxf git commit: Fixing merge

[coheigea]

Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: f09bcb55c8841279dbb4c64d777f7e1c50a98196
Parents: cb3e854
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 10:49:59 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 10:49:59 2016 +0100

--
 parent/pom.xml | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f09bcb55/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 06e39fc..e9711ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,15 +68,9 @@
 1.1.3
 5.12.0
 1.9.8
-<<< HEAD
-2.0.0-M22
+2.0.0-M23
 2.3.7
 [2.0,2.4)
-===
-2.0.0-M23
-2.4.3
-[2.4,3.0)
->>> 9b2bda5... Updating Apache DS
 1.2.14
 1.54
 2.2_2

[2/4] cxf git commit: Updating Apache DS

[coheigea]

Updating Apache DS

# Conflicts:
#   parent/pom.xml


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

Branch: refs/heads/3.1.x-fixes
Commit: f9272b565c61ea255a88f12ee2ffa66305233d4f
Parents: 782a1cf
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 10:48:32 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 10:49:40 2016 +0100

--
 parent/pom.xml | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f9272b56/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 10e72f4..06e39fc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,9 +68,15 @@
 1.1.3
 5.12.0
 1.9.8
+<<< HEAD
 2.0.0-M22
 2.3.7
 [2.0,2.4)
+===
+2.0.0-M23
+2.4.3
+[2.4,3.0)
+>>> 9b2bda5... Updating Apache DS
 1.2.14
 1.54
 2.2_2

[4/4] cxf git commit: Removing "TODO" code due to impending WSS4J release

[coheigea]

Removing "TODO" code due to impending WSS4J release


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

Branch: refs/heads/3.1.x-fixes
Commit: 97fc24b158d3deb18a388a49b01b3436e6c7b1b7
Parents: f09bcb5
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 11:33:29 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 11:33:29 2016 +0100

--
 .../wss4j/PolicyBasedWSS4JInInterceptor.java| 74 
 1 file changed, 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/97fc24b1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index 962b5ce..0370c75 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -24,8 +24,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
-import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPException;
@@ -33,7 +31,6 @@ import javax.xml.stream.XMLStreamException;
 
 import org.w3c.dom.Element;
 import org.apache.cxf.binding.soap.SoapMessage;
-import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.MessageUtils;
@@ -46,10 +43,8 @@ import 
org.apache.cxf.ws.security.wss4j.policyvalidators.PolicyValidatorParamete
 import 
org.apache.cxf.ws.security.wss4j.policyvalidators.SecurityPolicyValidator;
 import org.apache.cxf.ws.security.wss4j.policyvalidators.ValidatorUtils;
 import org.apache.wss4j.common.crypto.Crypto;
-import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.PasswordEncryptor;
 import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -70,8 +65,6 @@ import org.apache.wss4j.policy.model.Wss11;
  */
 public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
 
-private static final Logger LOG = 
LogUtils.getL7dLogger(PolicyBasedWSS4JInInterceptor.class);
-
 /**
  * 
  */
@@ -88,73 +81,6 @@ public class PolicyBasedWSS4JInInterceptor extends 
WSS4JInInterceptor {
 }
 }
 
-/**
- * TODO - This method can be removed when WSS4J 2.1.7 is released - see 
WSS-582
- * 
- * Load a Crypto instance. Firstly, it tries to use the 
cryptoPropertyRefId tag to retrieve
- * a Crypto object via a custom reference Id. Failing this, it tries to 
load the crypto
- * instance via the cryptoPropertyFile tag.
- *
- * @param requestData the RequestData object
- * @return a Crypto instance to use for Encryption creation/verification
- */
-@Override
-protected Crypto loadCrypto(
-String cryptoPropertyFile,
-String cryptoPropertyRefId,
-RequestData requestData
-) throws WSSecurityException {
-Object mc = requestData.getMsgContext();
-Crypto crypto = null;
-
-//
-// Try the Property Ref Id first
-//
-String refId = getString(cryptoPropertyRefId, mc);
-if (refId != null) {
-crypto = cryptos.get(refId);
-if (crypto == null) {
-Object obj = getProperty(mc, refId);
-if (obj instanceof Properties) {
-crypto = CryptoFactory.getInstance((Properties)obj,
-   
Loader.getClassLoader(CryptoFactory.class),
-   
getPasswordEncryptor(requestData));
-cryptos.put(refId, crypto);
-} else if (obj instanceof Crypto) {
-// No need to cache this as it's already loaded
-crypto = (Crypto)obj;
-}
-}
-if (crypto == null) {
-LOG.warning("The Crypto reference " + refId + " specified by "
-+ cryptoPropertyRefId + " could not be loaded"
-);
-}
-}
-

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

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 782a1cfce -> 97fc24b15


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

Branch: refs/heads/3.1.x-fixes
Commit: cb3e85497e96020bec19a7edb9ae3b02b277bbc9
Parents: f9272b5
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 10:49:40 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 10:49:40 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/cb3e8549/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index aebb000..014811a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -131,6 +131,7 @@ M 8f8e587cde7ec97410da6b0586810ccf8f0f3233
 M 8fbf0941ca52aac406b3efcf2e0d73436c72d0f1
 M 91bb2a18f4653f997e455c5089e7a009310591c6
 M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
+M 9b2bda583c09861c693122ab631c4bffa2187ddd
 M 9b816a21d8b85cc051be59a8ab6e968c5d0d
 M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
 M a034e5853484a7ef0a9f0ad1ae6582178f622f31

cxf git commit: Updating Apache DS

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 6cfb72710 -> 9b2bda583


Updating Apache DS


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

Branch: refs/heads/master
Commit: 9b2bda583c09861c693122ab631c4bffa2187ddd
Parents: 6cfb727
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 10:48:32 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 10:48:32 2016 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9b2bda58/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ff3ffd8..df94120 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,7 +68,7 @@
 1.1.3
 5.12.1
 1.9.8
-2.0.0-M22
+2.0.0-M23
 2.4.3
 [2.4,3.0)
 1.2.14

cxf git commit: [CXF-6960] Updates to the Swagger link at the services page

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 9fb6e0459 -> 6cfb72710


[CXF-6960] Updates to the Swagger link at the services page


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

Branch: refs/heads/master
Commit: 6cfb72710d74262f53354b43adcdffc13423e54c
Parents: 9fb6e04
Author: Sergey Beryozkin 
Authored: Mon Jul 25 12:04:10 2016 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 25 12:04:10 2016 +0300

--
 .../src/main/release/samples/jax_rs/spring_boot/README|  5 +
 .../samples/jax_rs/spring_boot_scan/application/README|  5 +
 .../servlet/servicelist/FormattedServiceListWriter.java   | 10 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6cfb7271/distribution/src/main/release/samples/jax_rs/spring_boot/README
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/README 
b/distribution/src/main/release/samples/jax_rs/spring_boot/README
index 21c6e5b..7fdc9c1 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/README
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/README
@@ -25,6 +25,11 @@ open the Swagger-UI page at
 
   
http://localhost:8080/services/helloservice/api-docs?url=/services/helloservice/swagger.json
 
+or access it from the CXF Services page:
+
+  http://localhost:8080/services/helloservice/services
+  and follow a Swagger link.
+
 To run the client from a command line open a new terminal window and run:
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/6cfb7271/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
index a054dc8..baeb48c 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
@@ -38,5 +38,10 @@ open the Swagger-UI page at
 
   
http://localhost:8080/services/helloservice/api-docs?url=/services/helloservice/swagger.json
 
+or access it from the CXF Services page:
+
+  http://localhost:8080/services/helloservice/services
+  and follow a Swagger link.
+
 Check client/README on how to run a command line client.
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/6cfb7271/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
index 7bb75ae..0c25519 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
@@ -20,6 +20,7 @@ package org.apache.cxf.transport.servlet.servicelist;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.URI;
 import java.util.Map;
 
 import org.apache.cxf.Bus;
@@ -175,7 +176,14 @@ public class FormattedServiceListWriter implements 
ServiceListWriter {
 if (bus != null && 
PropertyUtils.isTrue(bus.getProperty("swagger.service.description.available"))) 
{
 String swaggerPath = "swagger.json";
 if 
(PropertyUtils.isTrue(bus.getProperty("swagger.service.ui.available"))) {
-swaggerPath = "api-docs?url=/" + swaggerPath;
+URI uri = URI.create(absoluteURL);
+String schemePath = uri.getScheme() + "://" + uri.getHost() 
++ (uri.getPort() == -1 ? "" : ":" + uri.getPort());
+String relPath = absoluteURL.substring(schemePath.length());
+if (!relPath.endsWith("/")) {
+relPath += "/";
+}
+swaggerPath = "api-docs?url=" + relPath + swaggerPath;
 }
 if (!absoluteURL.endsWith("/")) {
 swaggerPath = "/" + swaggerPath;