[2/2] cxf git commit: [CXF-6186] Make JMS sample match others

2017-04-03 Thread dkulp 
[CXF-6186] Make JMS sample match others


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

Branch: refs/heads/3.0.x-fixes
Commit: 631a98b5f729dcd2acdc4493c322f32fe50a21a5
Parents: 1630bf6
Author: Daniel Kulp 
Authored: Mon Apr 3 14:48:13 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 14:53:15 2017 -0400

--
 .../customerservice/server/CustomerServiceSpringServer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/631a98b5/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
--
diff --git 
a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
 
b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
index f7e4af9..034eed1 100644
--- 
a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
+++ 
b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
@@ -30,9 +30,9 @@ public final class CustomerServiceSpringServer {
 public static void main(String args[]) throws Exception {
 ClassPathXmlApplicationContext ctx
 = new 
ClassPathXmlApplicationContext("server-applicationContext.xml");
-System.out.println("Server started. Press any key to shut down.");
-System.in.read();
+Thread.sleep(5 * 60 * 1000);
 ctx.close();
+System.out.println("Server exiting");
 }
 
 }

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

2017-04-03 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 1630bf6c6 -> 59437cb51


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

Branch: refs/heads/3.0.x-fixes
Commit: 59437cb513c3c0c2e029222abdb76a4ce87c13b0
Parents: 631a98b
Author: Daniel Kulp 
Authored: Mon Apr 3 14:53:15 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 14:53:15 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/59437cb5/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 89dac1e..57185a6 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -21,6 +21,7 @@ B 03a3cf4f94236f94fc35c39b5c075ff79c82e0dc
 B 03bd1b4f0beaddf4df112f7c08d5749862805dfa
 B 03d40ca7c69745cee841583464e7e4cca972bb8b
 B 03d63bca6fd9497ddeba1a0657929150d02827d2
+B 03f4a105f63c187945c306d72ab5102fc731bb43
 B 04300f6e34a3243418f764640f85be60eb7e05df
 B 04771f9b93c86197b194791d502fd224dbb1eacc
 B 04932cc6e66a6bca0ae25f2bf68e97f6241736eb
@@ -293,6 +294,7 @@ B 2ceb8351e2cd174297c5bf11c389280a33b39fc3
 B 2cfa9011aaada9fe68bd0d9aad7ec86991ede43c
 B 2cfc6a944bdb2050ca38bea1961ac0b32f9e70c8
 B 2cfc8d8a6eefe81603e77a8a9e4b862f8c08546c
+B 2d0e87466ccf59f0572cbf83479ef20777e4004e
 B 2d3592e667e0ed5c2345b8fe1ae248a6b0fb1b43
 B 2d41042ebc1ee81b61aad4b08938c1c73626b968
 B 2d4648516a5b4043c4250b039ac441878d6a734c
@@ -1103,6 +1105,7 @@ B a857810da69c43cde90073c77929b5d213d8dc28
 B a8787e71d799bedbeb697c5f86422201c8d429fe
 B a892678e5e2976d0c46ccdc44acb303e855aad9a
 B a8f1f095ecddd639d1496c1fa6189ebf2e371716
+B a929d9b8800b641ee7d9135ae40566892bfd0edd
 B a92a1e680d5c7f25ce80295629920fc367442feb
 B a95fdec3fc81f92692ce12aab8e5b7a7e6862ebf
 B a9e7837d71973a76eed184e764d21035969132e7
@@ -1923,6 +1926,7 @@ M a895f30153e9c2430cc7d96351074ac986588cf0
 M a9555675b829acdfb1672bc2157d6f3c08fdd652
 M a97f886f36c8aea2a49860ec8cd33b0021b7b9e2
 M a9a1305a9588d2c886d763d0c1ef892c2b9b0b71
+M aa5c4f9e5ec24337cf48e8b02a4609f225c62869
 M aa7aef8dc771ecfd8cfa428a83d3f529accbd10a
 M aaad96fdf931cdc619a60fbffe3c9c894ae8ea43
 M ac6934471be92cf6bedb04dc20087936141dab4f

[2/2] cxf git commit: [CXF-6186] Make JMS sample match others

2017-04-03 Thread dkulp 
[CXF-6186] Make JMS sample match others


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

Branch: refs/heads/3.1.x-fixes
Commit: 6134810d95aa3543472c7642c45b4ed2905ba6f0
Parents: 2d0e874
Author: Daniel Kulp 
Authored: Mon Apr 3 14:48:13 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 14:52:41 2017 -0400

--
 .../customerservice/server/CustomerServiceSpringServer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6134810d/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
--
diff --git 
a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
 
b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
index f7e4af9..034eed1 100644
--- 
a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
+++ 
b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
@@ -30,9 +30,9 @@ public final class CustomerServiceSpringServer {
 public static void main(String args[]) throws Exception {
 ClassPathXmlApplicationContext ctx
 = new 
ClassPathXmlApplicationContext("server-applicationContext.xml");
-System.out.println("Server started. Press any key to shut down.");
-System.in.read();
+Thread.sleep(5 * 60 * 1000);
 ctx.close();
+System.out.println("Server exiting");
 }
 
 }

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

2017-04-03 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2d0e87466 -> 03f4a105f


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

Branch: refs/heads/3.1.x-fixes
Commit: 03f4a105f63c187945c306d72ab5102fc731bb43
Parents: 6134810
Author: Daniel Kulp 
Authored: Mon Apr 3 14:52:41 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 14:52:41 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/03f4a105/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index dc2019e..d47a8e0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -418,6 +418,7 @@ M 7228709bff3fe66626830b0018547d001588da00
 M 726c0aa641e408a18fa5f4ff82df682d489874f4
 M 7304dfbd8f3044d8d46981abf2058c6cb732d219
 M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
+M 7476fc331f00a01851b5fbb66758818bef8ba2c4
 M 74a5139520ac289d3a6d93da14573ef7501b8d1d
 M 74b8db2dcc5fc60a513d9e73e258aeba99727a39
 M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81

cxf git commit: [CXF-6186] Make JMS sample match others

2017-04-03 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/master 7476fc331 -> 2323abc24


[CXF-6186] Make JMS sample match others


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

Branch: refs/heads/master
Commit: 2323abc24bab12b7d9f1fdd7051419d23180122e
Parents: 7476fc3
Author: Daniel Kulp 
Authored: Mon Apr 3 14:48:13 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 14:48:13 2017 -0400

--
 .../customerservice/server/CustomerServiceSpringServer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2323abc2/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
--
diff --git 
a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
 
b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
index 73f5497..bd1b515 100644
--- 
a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
+++ 
b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
@@ -30,9 +30,9 @@ public final class CustomerServiceSpringServer {
 public static void main(String args[]) throws Exception {
 ClassPathXmlApplicationContext ctx
 = new 
ClassPathXmlApplicationContext("server-applicationContext.xml");
-System.out.println("Server started. Press any key to shut down.");
-System.in.read();
+Thread.sleep(5 * 60 * 1000);
 ctx.close();
+System.out.println("Server exiting");
 }
 
 }

cxf git commit: [CXF-7058] Extra CDATA elements added on long CDATA payload Allow passing woodstox config to bypass the issue This closes #169

2017-04-03 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes cd4e2423d -> 1630bf6c6


[CXF-7058] Extra CDATA elements added on long CDATA payload
Allow passing woodstox config to bypass the issue
This closes #169


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

Branch: refs/heads/3.0.x-fixes
Commit: 1630bf6c68028997da67ee37bae8f4cb46aa9546
Parents: cd4e242
Author: Rodrigo Merino 
Authored: Wed Sep 14 13:22:27 2016 -0300
Committer: Daniel Kulp 
Committed: Mon Apr 3 14:30:15 2017 -0400

--
 .../org/apache/cxf/staxutils/StaxUtils.java | 23 +++-
 1 file changed, 13 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1630bf6c/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java 
b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index 3a8e5fa..00ad5ec 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -106,6 +106,8 @@ public final class StaxUtils {
 "org.apache.cxf.stax.maxAttributeSize";
 public static final String MAX_TEXT_LENGTH = 
 "org.apache.cxf.stax.maxTextLength";
+public static final String MIN_TEXT_SEGMENT =
+"org.apache.cxf.stax.minTextSegment";
 public static final String MAX_ELEMENT_COUNT = 
 "org.apache.cxf.stax.maxElementCount";
 public static final String MAX_XML_CHARACTERS = 
@@ -138,6 +140,7 @@ public final class StaxUtils {
 private static int maxAttributeCount = 500; 
 private static int maxAttributeSize = 64 * 1024; //64K per attribute, 
likely just "list" will hit
 private static int maxTextLength = 128 * 1024 * 1024;  //128M - more than 
this should DEFINITLEY use MTOM 
+private static int minTextSegment = 64; // Same default as woodstox
 private static long maxElementCount = Long.MAX_VALUE;
 private static long maxXMLCharacters = Long.MAX_VALUE;
 
@@ -158,6 +161,7 @@ public final class StaxUtils {
 maxAttributeCount = getInteger(MAX_ATTRIBUTE_COUNT, 
maxAttributeCount); 
 maxAttributeSize = getInteger(MAX_ATTRIBUTE_SIZE, maxAttributeSize);
 maxTextLength = getInteger(MAX_TEXT_LENGTH, maxTextLength); 
+minTextSegment = getInteger(MIN_TEXT_SEGMENT, minTextSegment);
 maxElementCount = getLong(MAX_ELEMENT_COUNT, maxElementCount);
 maxXMLCharacters = getLong(MAX_XML_CHARACTERS, maxXMLCharacters);
 
@@ -361,16 +365,15 @@ public final class StaxUtils {
 private static boolean setRestrictionProperties(XMLInputFactory factory) {
 //For now, we can only support Woodstox 4.2.x and newer as none of the 
other
 //stax parsers support these settings
-if (setProperty(factory, "com.ctc.wstx.maxAttributesPerElement", 
maxAttributeCount)
-&& setProperty(factory, "com.ctc.wstx.maxAttributeSize", 
maxAttributeSize)
-&& setProperty(factory, "com.ctc.wstx.maxChildrenPerElement", 
innerElementCountThreshold)
-&& setProperty(factory, "com.ctc.wstx.maxElementCount", 
maxElementCount)
-&& setProperty(factory, "com.ctc.wstx.maxElementDepth", 
innerElementLevelThreshold)
-&& setProperty(factory, "com.ctc.wstx.maxCharacters", 
maxXMLCharacters)
-&& setProperty(factory, "com.ctc.wstx.maxTextLength", 
maxTextLength)) {
-return true;
-}
-return false;
+final boolean wstxMaxs = setProperty(factory, 
"com.ctc.wstx.maxAttributesPerElement", maxAttributeCount)
+&& setProperty(factory, "com.ctc.wstx.maxAttributeSize", 
maxAttributeSize)
+&& setProperty(factory, 
"com.ctc.wstx.maxChildrenPerElement", innerElementCountThreshold)
+&& setProperty(factory, "com.ctc.wstx.maxElementCount", 
maxElementCount)
+&& setProperty(factory, "com.ctc.wstx.maxElementDepth", 
innerElementLevelThreshold)
+&& setProperty(factory, "com.ctc.wstx.maxCharacters", 
maxXMLCharacters)
+&& setProperty(factory, "com.ctc.wstx.maxTextLength", 
maxTextLength);
+return wstxMaxs
+&& setProperty(factory, "com.ctc.wstx.minTextSegment", 
minTextSegment);
 }
 
 private static boolean setProperty(XMLInputFactory f, String p, Object o) {

cxf git commit: Adding an option to hint to OAuth2 view handlers if single page apps can be supported

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a929d9b88 -> 2d0e87466


Adding an option to hint to OAuth2 view handlers if single page apps can be 
supported


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

Branch: refs/heads/3.1.x-fixes
Commit: 2d0e87466ccf59f0572cbf83479ef20777e4004e
Parents: a929d9b
Author: Sergey Beryozkin 
Authored: Mon Apr 3 17:17:40 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 17:21:07 2017 +0100

--
 .../security/oauth2/common/OAuthAuthorizationData.java  | 12 +++-
 .../oauth2/services/RedirectionBasedGrantService.java   |  7 ++-
 2 files changed, 17 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2d0e8746/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
index a2d4d76..b9bc1f4 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
@@ -55,7 +55,8 @@ public class OAuthAuthorizationData extends 
OAuthRedirectionState implements Ser
 private List alreadyAuthorizedPermissions;
 private boolean hidePreauthorizedScopesInForm;
 private boolean applicationRegisteredDynamically;
-
+private boolean supportSinglePageApplications;
+
 public OAuthAuthorizationData() {
 }
 
@@ -266,4 +267,13 @@ public class OAuthAuthorizationData extends 
OAuthRedirectionState implements Ser
 this.applicationRegisteredDynamically = 
applicationRegisteredDynamically;
 }
 
+public boolean isSupportSinglePageApplications() {
+return supportSinglePageApplications;
+}
+
+public void setSupportSinglePageApplications(boolean 
supportSinglePageApplications) {
+this.supportSinglePageApplications = supportSinglePageApplications;
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/2d0e8746/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
index b708c71..7255446 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
@@ -71,7 +71,8 @@ public abstract class RedirectionBasedGrantService extends 
AbstractOAuthService
 private boolean hidePreauthorizedScopesInForm;
 private AuthorizationRequestFilter authorizationFilter;
 private List scopesRequiringNoConsent;
-
+private boolean supportSinglePageApplications = true;
+
 protected RedirectionBasedGrantService(String supportedResponseType,
String supportedGrantType) {
 this(Collections.singleton(supportedResponseType), supportedGrantType);
@@ -288,6 +289,7 @@ public abstract class RedirectionBasedGrantService extends 
AbstractOAuthService
 Map extraProperties = client.getProperties();
 secData.setExtraApplicationProperties(extraProperties);
 
secData.setApplicationRegisteredDynamically(client.isRegisteredDynamically());
+
secData.setSupportSinglePageApplications(supportSinglePageApplications);
 String replyTo = getMessageContext().getUriInfo()
 .getAbsolutePathBuilder().path("decision").build().toString();
 secData.setReplyTo(replyTo);
@@ -578,4 +580,7 @@ public abstract class RedirectionBasedGrantService extends 
AbstractOAuthService
 public void setScopesRequiringNoConsent(List 
scopesRequiringNoConsent) {
 this.scopesRequiringNoConsent = scopesRequiringNoConsent;
 }
+public void setSupportSinglePageApplications(boolean

cxf git commit: Adding an option to hint to OAuth2 view handlers if single page apps can be supported

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master c704db9f6 -> 7476fc331


Adding an option to hint to OAuth2 view handlers if single page apps can be 
supported


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

Branch: refs/heads/master
Commit: 7476fc331f00a01851b5fbb66758818bef8ba2c4
Parents: c704db9
Author: Sergey Beryozkin 
Authored: Mon Apr 3 17:17:40 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 17:17:40 2017 +0100

--
 .../rs/security/oauth2/common/OAuthAuthorizationData.java | 10 ++
 .../oauth2/services/RedirectionBasedGrantService.java |  5 +
 2 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7476fc33/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
index 7a48504..01aeded 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
@@ -55,6 +55,7 @@ public class OAuthAuthorizationData extends 
OAuthRedirectionState implements Ser
 private List alreadyAuthorizedPermissions;
 private boolean hidePreauthorizedScopesInForm;
 private boolean applicationRegisteredDynamically;
+private boolean supportSinglePageApplications;
 
 public OAuthAuthorizationData() {
 }
@@ -266,4 +267,13 @@ public class OAuthAuthorizationData extends 
OAuthRedirectionState implements Ser
 this.applicationRegisteredDynamically = 
applicationRegisteredDynamically;
 }
 
+public boolean isSupportSinglePageApplications() {
+return supportSinglePageApplications;
+}
+
+public void setSupportSinglePageApplications(boolean 
supportSinglePageApplications) {
+this.supportSinglePageApplications = supportSinglePageApplications;
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/7476fc33/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
index ca4b800..6798323 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
@@ -71,6 +71,7 @@ public abstract class RedirectionBasedGrantService extends 
AbstractOAuthService
 private boolean hidePreauthorizedScopesInForm;
 private AuthorizationRequestFilter authorizationFilter;
 private List scopesRequiringNoConsent;
+private boolean supportSinglePageApplications = true;
 
 protected RedirectionBasedGrantService(String supportedResponseType,
String supportedGrantType) {
@@ -288,6 +289,7 @@ public abstract class RedirectionBasedGrantService extends 
AbstractOAuthService
 Map extraProperties = client.getProperties();
 secData.setExtraApplicationProperties(extraProperties);
 
secData.setApplicationRegisteredDynamically(client.isRegisteredDynamically());
+
secData.setSupportSinglePageApplications(supportSinglePageApplications);
 String replyTo = getMessageContext().getUriInfo()
 .getAbsolutePathBuilder().path("decision").build().toString();
 secData.setReplyTo(replyTo);
@@ -578,4 +580,7 @@ public abstract class RedirectionBasedGrantService extends 
AbstractOAuthService
 public void setScopesRequiringNoConsent(List 
scopesRequiringNoConsent) {
 this.scopesRequiringNoConsent = scopesRequiringNoConsent;
 }
+public void setSupportSinglePageApplications(boolean 
supportSinglePageApplications) {
+this.supportSinglePageApplications = supportSinglePageApplications;
+}
 }

cxf git commit: [CXF-7297] Checking if scopesRequiringNoConsent includes all of the request scope values is enough

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes aa5c4f9e5 -> a929d9b88


[CXF-7297] Checking if scopesRequiringNoConsent includes all of the request 
scope values is enough


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

Branch: refs/heads/3.1.x-fixes
Commit: a929d9b8800b641ee7d9135ae40566892bfd0edd
Parents: aa5c4f9
Author: Sergey Beryozkin 
Authored: Mon Apr 3 17:03:06 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 17:05:09 2017 +0100

--
 .../rs/security/oauth2/services/RedirectionBasedGrantService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a929d9b8/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
index 1ab30b8..b708c71 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
@@ -247,8 +247,7 @@ public abstract class RedirectionBasedGrantService extends 
AbstractOAuthService
   List 
permissions) {
 return scopesRequiringNoConsent != null 
&& requestedScope != null
-   && requestedScope.size() == scopesRequiringNoConsent.size()
-   && requestedScope.containsAll(scopesRequiringNoConsent);
+   && scopesRequiringNoConsent.containsAll(requestedScope);
 }
 
 /**

cxf git commit: [CXF-7297] Checking if scopesRequiringNoConsent includes all of the request scope values is enough

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 20c759872 -> c704db9f6


[CXF-7297] Checking if scopesRequiringNoConsent includes all of the request 
scope values is enough


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

Branch: refs/heads/master
Commit: c704db9f67f5baef0fdbbe8dc583b8017dfb917f
Parents: 20c7598
Author: Sergey Beryozkin 
Authored: Mon Apr 3 17:03:06 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 17:03:06 2017 +0100

--
 .../rs/security/oauth2/services/RedirectionBasedGrantService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c704db9f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
index 7646469..ca4b800 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
@@ -247,8 +247,7 @@ public abstract class RedirectionBasedGrantService extends 
AbstractOAuthService
   List 
permissions) {
 return scopesRequiringNoConsent != null
&& requestedScope != null
-   && requestedScope.size() == scopesRequiringNoConsent.size()
-   && requestedScope.containsAll(scopesRequiringNoConsent);
+   && scopesRequiringNoConsent.containsAll(requestedScope);
 }
 
 /**

cxf git commit: Minor update to FailoverWebClient test

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes fc738d4e7 -> cd4e2423d


Minor update to FailoverWebClient test


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

Branch: refs/heads/3.0.x-fixes
Commit: cd4e2423dd82662ed59e2396aaa5f9a301df0fb4
Parents: fc738d4
Author: Sergey Beryozkin 
Authored: Mon Apr 3 16:18:43 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 16:21:55 2017 +0100

--
 .../cxf/systest/jaxrs/failover/FailoverWebClientTest.java  | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cd4e2423/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
index 4784856..039030f 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
@@ -68,16 +68,22 @@ public class FailoverWebClientTest extends 
AbstractBusClientServerTestBase {
 Book b = webClient.get(Book.class);
 assertEquals(124L, b.getId());
 assertEquals("root", b.getName());
+assertEquals("http://localhost:; + PORT1 + "/bookstore",
+ webClient.getBaseURI().toString());
 
 // Should failover to PORT2
 webClient.get(Book.class);
 assertEquals(124L, b.getId());
 assertEquals("root", b.getName());
+assertEquals("http://localhost:; + PORT2 + "/bookstore",
+ webClient.getBaseURI().toString());
 
 // Should failover to PORT3
 webClient.get(Book.class);
 assertEquals(124L, b.getId());
 assertEquals("root", b.getName());
+assertEquals("http://localhost:; + PORT3 + "/bookstore",
+ webClient.getBaseURI().toString());
 }
 
 }

cxf git commit: Minor update to FailoverWebClient test

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c2206aec5 -> aa5c4f9e5


Minor update to FailoverWebClient test


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

Branch: refs/heads/3.1.x-fixes
Commit: aa5c4f9e5ec24337cf48e8b02a4609f225c62869
Parents: c2206ae
Author: Sergey Beryozkin 
Authored: Mon Apr 3 16:18:43 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 16:20:49 2017 +0100

--
 .../cxf/systest/jaxrs/failover/FailoverWebClientTest.java  | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/aa5c4f9e/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
index f77a429..5d8ded7 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
@@ -68,16 +68,22 @@ public class FailoverWebClientTest extends 
AbstractBusClientServerTestBase {
 Book b = webClient.get(Book.class);
 assertEquals(124L, b.getId());
 assertEquals("root", b.getName());
+assertEquals("http://localhost:; + PORT1 + "/bookstore",
+ webClient.getBaseURI().toString());
 
 // Should failover to PORT2
 webClient.get(Book.class);
 assertEquals(124L, b.getId());
 assertEquals("root", b.getName());
+assertEquals("http://localhost:; + PORT2 + "/bookstore",
+ webClient.getBaseURI().toString());
 
 // Should failover to PORT3
 webClient.get(Book.class);
 assertEquals(124L, b.getId());
 assertEquals("root", b.getName());
+assertEquals("http://localhost:; + PORT3 + "/bookstore",
+ webClient.getBaseURI().toString());
 }
 
 }
\ No newline at end of file

cxf git commit: Minor update to FailoverWebClient test

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 7783ffc52 -> 20c759872


Minor update to FailoverWebClient test


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

Branch: refs/heads/master
Commit: 20c759872e9de8cc445420156cfb45880b5cf5f9
Parents: 7783ffc
Author: Sergey Beryozkin 
Authored: Mon Apr 3 16:18:43 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 16:18:43 2017 +0100

--
 .../cxf/systest/jaxrs/failover/FailoverWebClientTest.java  | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/20c75987/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
index f77a429..5d8ded7 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
@@ -68,16 +68,22 @@ public class FailoverWebClientTest extends 
AbstractBusClientServerTestBase {
 Book b = webClient.get(Book.class);
 assertEquals(124L, b.getId());
 assertEquals("root", b.getName());
+assertEquals("http://localhost:; + PORT1 + "/bookstore",
+ webClient.getBaseURI().toString());
 
 // Should failover to PORT2
 webClient.get(Book.class);
 assertEquals(124L, b.getId());
 assertEquals("root", b.getName());
+assertEquals("http://localhost:; + PORT2 + "/bookstore",
+ webClient.getBaseURI().toString());
 
 // Should failover to PORT3
 webClient.get(Book.class);
 assertEquals(124L, b.getId());
 assertEquals("root", b.getName());
+assertEquals("http://localhost:; + PORT3 + "/bookstore",
+ webClient.getBaseURI().toString());
 }
 
 }
\ No newline at end of file

[2/2] cxf git commit: Remove test that shouldn't be there

2017-04-03 Thread dkulp 
Remove test that shouldn't be there


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

Branch: refs/heads/3.0.x-fixes
Commit: 6d616521ad50440baef20522bb44c67023e84c45
Parents: 6985c09
Author: Daniel Kulp 
Authored: Mon Apr 3 11:16:22 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 11:18:03 2017 -0400

--
 .../org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java| 8 
 1 file changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6d616521/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index f3cc145..52f87f6 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -1197,14 +1197,6 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
 }
 }
 
-
-@Test
-public void testsdfasdf() throws Exception {
-env.put(ToolConstants.CFG_WSDLURL, 
"/Users/dkulp/Downloads/test/WSDL.wsdl");
-processor.setContext(env);
-processor.execute();
-}
-
 @Test
 public void testCXF5280() throws Exception {
 env.put(ToolConstants.CFG_ALL, "all");

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

2017-04-03 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 6985c0975 -> fc738d4e7


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

Branch: refs/heads/3.0.x-fixes
Commit: fc738d4e78ace78db0b70ee88c5e00d031fb7f19
Parents: 6d61652
Author: Daniel Kulp 
Authored: Mon Apr 3 11:18:03 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 11:18:03 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/fc738d4e/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1a2daf4..89dac1e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1277,6 +1277,7 @@ B c15592b4a48a14f29c899ac4590273606f7ba0e3
 B c1c9562bb13eeacdd9dae5a46c513e9e03625698
 B c1dd0748cd2af888e3e03c8a6f46b9550b281f64
 B c1f60084b09e4b38e738c32048c638154919fab9
+B c2206aec5d1abd729c40dac147d1966810b9ed3f
 B c22db8ef5b7fcb5cf2402ac5bdc52a2edffcb5c3
 B c27dc582c203d01fa8f63f500def10f0ae57d1e4
 B c2b70fd462955b714f0211ff52e1f99399666d44

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

2017-04-03 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 48c7e42bc -> c2206aec5


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

Branch: refs/heads/3.1.x-fixes
Commit: c2206aec5d1abd729c40dac147d1966810b9ed3f
Parents: ef46536
Author: Daniel Kulp 
Authored: Mon Apr 3 11:17:33 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 11:17:33 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/c2206aec/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 22c186f..dc2019e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -493,6 +493,7 @@ M c7d50ca238184789412737ea0f0db4b5b5503326
 M c87613b800a5b2de25d861c3c74a0fb7dcf60862
 M c9875c223627a17f7d8128632b25bdf6bf148918
 M cbd4e7fa6b3e15d39f12d39a448ee3742d5d3efe
+M cbf0ca69edb54ce58fc8063dfaa03fa497004ec6
 M cd782fef123d2147a6f5cb04fb6cdfe8cf0ac81a
 M cf806d5cba74e47c6e5ba3231df4228cbaad3e90
 M cf8ac102e728b8745da265ec969f7b5160829fdb

[2/2] cxf git commit: Remove test that shouldn't be there

2017-04-03 Thread dkulp 
Remove test that shouldn't be there


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

Branch: refs/heads/3.1.x-fixes
Commit: ef46536366fcd0aa179e284b07150a8bf5178742
Parents: 48c7e42
Author: Daniel Kulp 
Authored: Mon Apr 3 11:16:22 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 11:17:33 2017 -0400

--
 .../org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java| 8 
 1 file changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ef465363/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index db2acba..202c98b 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -1196,14 +1196,6 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
 }
 }
 
-
-@Test
-public void testsdfasdf() throws Exception {
-env.put(ToolConstants.CFG_WSDLURL, 
"/Users/dkulp/Downloads/test/WSDL.wsdl");
-processor.setContext(env);
-processor.execute();
-}
-
 @Test
 public void testCXF5280() throws Exception {
 env.put(ToolConstants.CFG_ALL, "all");

cxf git commit: Remove test that shouldn't be there

2017-04-03 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/master 443b9ae19 -> 7783ffc52


Remove test that shouldn't be there


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

Branch: refs/heads/master
Commit: 7783ffc52f34faae5e202df1eb681f5775dfb388
Parents: 443b9ae
Author: Daniel Kulp 
Authored: Mon Apr 3 11:16:22 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Apr 3 11:16:22 2017 -0400

--
 .../org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java| 8 
 1 file changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7783ffc5/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index 4d67f65..6386eb1 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -1196,14 +1196,6 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
 }
 }
 
-
-@Test
-public void testsdfasdf() throws Exception {
-env.put(ToolConstants.CFG_WSDLURL, 
"/Users/dkulp/Downloads/test/WSDL.wsdl");
-processor.setContext(env);
-processor.execute();
-}
-
 @Test
 public void testCXF5280() throws Exception {
 env.put(ToolConstants.CFG_ALL, "all");

cxf git commit: Fixing 3.0.x build failures

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 0e955bc5d -> 6985c0975


Fixing 3.0.x build failures


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

Branch: refs/heads/3.0.x-fixes
Commit: 6985c097517b474911611d64637092d67262a0dc
Parents: 0e955bc
Author: Sergey Beryozkin 
Authored: Mon Apr 3 14:24:39 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 14:24:39 2017 +0100

--
 .../apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java | 4 ++--
 .../cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6985c097/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
index f77a429..4784856 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
@@ -55,7 +55,7 @@ public class FailoverWebClientTest extends 
AbstractBusClientServerTestBase {
 
 FailoverFeature failoverFeature = new FailoverFeature();
 SequentialStrategy strategy = new SequentialStrategy();
-List addresses = new ArrayList<>();
+List addresses = new ArrayList();
 addresses.add("http://localhost:; + PORT2 + "/bookstore");
 addresses.add("http://localhost:; + PORT3 + "/bookstore");
 strategy.setAlternateAddresses(addresses);
@@ -80,4 +80,4 @@ public class FailoverWebClientTest extends 
AbstractBusClientServerTestBase {
 assertEquals("root", b.getName());
 }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/6985c097/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
index 03ce218..df1bf7d 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
@@ -57,7 +57,7 @@ public class LoadDistributorWebClientTest extends 
AbstractBusClientServerTestBas
 
 LoadDistributorFeature feature = new LoadDistributorFeature();
 SequentialStrategy strategy = new SequentialStrategy();
-List addresses = new ArrayList<>();
+List addresses = new ArrayList();
 addresses.add(address);
 addresses.add("http://localhost:; + PORT2 + "/bookstore");
 strategy.setAlternateAddresses(addresses);
@@ -77,4 +77,4 @@ public class LoadDistributorWebClientTest extends 
AbstractBusClientServerTestBas
 
 }
 
-}
\ No newline at end of file
+}

cxf-fediz git commit: Updating WSS4J

2017-04-03 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes e8a3e3a04 -> 12626f257


Updating WSS4J


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

Branch: refs/heads/1.3.x-fixes
Commit: 12626f2573580b097990d36578a479ee93cfd595
Parents: e8a3e3a
Author: Colm O hEigeartaigh 
Authored: Mon Apr 3 14:11:36 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 3 14:11:36 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/12626f25/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b578946..6e513c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
 3.2.10.RELEASE
 7.0.75
 8.0.41
-2.1.8
+2.1.9
 
 http://localhost:8080/manager/text
 UTF-8

cxf-fediz git commit: Updating WSS4J

2017-04-03 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 36480e970 -> d385478b9


Updating WSS4J


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

Branch: refs/heads/master
Commit: d385478b949b918b38f51b97fccd9053b2e6ce4c
Parents: 36480e9
Author: Colm O hEigeartaigh 
Authored: Mon Apr 3 14:11:15 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 3 14:11:15 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d385478b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c289703..08aed6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
 3.2.10.RELEASE
 7.0.75
 8.5.12
-2.1.9-SNAPSHOT
+2.1.9
 
 http://localhost:8080/manager/text
 UTF-8

[1/2] cxf git commit: Adding JAX-RS LB test

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 3b3b81e69 -> 0e955bc5d


Adding JAX-RS LB test


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

Branch: refs/heads/3.0.x-fixes
Commit: 0e955bc5da84d0826dd8dfbb01737b5d2d286636
Parents: 3b6be59
Author: Colm O hEigeartaigh 
Authored: Fri Mar 31 15:07:09 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 13:16:11 2017 +0100

--
 .../jaxrs/failover/FailoverWebClientTest.java   |  2 +-
 .../jaxrs/failover/LoadDistributorServer.java   | 43 +++
 .../failover/LoadDistributorWebClientTest.java  | 80 
 .../cxf/systest/jaxrs/failover/cxf-client.xml   | 43 +++
 .../systest/jaxrs/failover/cxf-lb-service.xml   | 65 
 5 files changed, 232 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0e955bc5/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
index eb7269f..f77a429 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
@@ -50,7 +50,7 @@ public class FailoverWebClientTest extends 
AbstractBusClientServerTestBase {
 }
 
 @Test
-public void testEchoXmlBookQuery() throws Exception {
+public void testFailover() throws Exception {
 String address = "http://localhost:; + PORT1 + "/bookstore";
 
 FailoverFeature failoverFeature = new FailoverFeature();

http://git-wip-us.apache.org/repos/asf/cxf/blob/0e955bc5/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
new file mode 100644
index 000..99a7436
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
@@ -0,0 +1,43 @@
+/**
+ * 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.failover;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class LoadDistributorServer extends AbstractBusTestServerBase {
+protected void run()  {
+URL busFile = Server.class.getResource("cxf-lb-service.xml");
+Bus busLocal = new SpringBusFactory().createBus(busFile);
+BusFactory.setDefaultBus(busLocal);
+setBus(busLocal);
+
+try {
+new Server();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/0e955bc5/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
new file mode 100644
index 000..03ce218
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software

[2/2] cxf git commit: Adding WebClient Failover test

2017-04-03 Thread sergeyb 
Adding WebClient Failover test


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

Branch: refs/heads/3.0.x-fixes
Commit: 3b6be5954a6c0dcfc36a07db7ec056f3e0a59006
Parents: 3b3b81e
Author: Colm O hEigeartaigh 
Authored: Fri Mar 31 12:52:41 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 13:16:11 2017 +0100

--
 .../jaxrs/failover/FailoverBookServer.java  | 43 ++
 .../jaxrs/failover/FailoverBookStore.java   | 47 +++
 .../jaxrs/failover/FailoverWebClientTest.java   | 83 
 .../cxf/systest/jaxrs/failover/cxf-service.xml  | 75 ++
 4 files changed, 248 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3b6be595/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
new file mode 100644
index 000..34e99b3
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
@@ -0,0 +1,43 @@
+/**
+ * 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.failover;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class FailoverBookServer extends AbstractBusTestServerBase {
+protected void run()  {
+URL busFile = Server.class.getResource("cxf-service.xml");
+Bus busLocal = new SpringBusFactory().createBus(busFile);
+BusFactory.setDefaultBus(busLocal);
+setBus(busLocal);
+
+try {
+new Server();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b6be595/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
new file mode 100644
index 000..29b5432
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
@@ -0,0 +1,47 @@
+/**
+ * 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.failover;
+
+
+import javax.ws.rs.GET;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.Path;
+
+import org.apache.cxf.systest.jaxrs.Book;
+
+/**
+ * Just allow one invocation + then return 404
+ */
+@Path("/bookstore")
+public class FailoverBookStore {
+
+private int counter;
+
+@GET
+@Path("/")
+public Book getBookRoot() {
+if (counter != 0) {
+throw new

[2/2] cxf git commit: Adding JAX-RS LB test

2017-04-03 Thread sergeyb 
Adding JAX-RS LB test


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

Branch: refs/heads/3.1.x-fixes
Commit: 48c7e42bcb066d37a8de3fe698593528cf5938a3
Parents: 40ffec3
Author: Colm O hEigeartaigh 
Authored: Fri Mar 31 15:07:09 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 13:11:22 2017 +0100

--
 .../jaxrs/failover/FailoverWebClientTest.java   |  2 +-
 .../jaxrs/failover/LoadDistributorServer.java   | 43 +++
 .../failover/LoadDistributorWebClientTest.java  | 80 
 .../cxf/systest/jaxrs/failover/cxf-client.xml   | 43 +++
 .../systest/jaxrs/failover/cxf-lb-service.xml   | 65 
 5 files changed, 232 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/48c7e42b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
index eb7269f..f77a429 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
@@ -50,7 +50,7 @@ public class FailoverWebClientTest extends 
AbstractBusClientServerTestBase {
 }
 
 @Test
-public void testEchoXmlBookQuery() throws Exception {
+public void testFailover() throws Exception {
 String address = "http://localhost:; + PORT1 + "/bookstore";
 
 FailoverFeature failoverFeature = new FailoverFeature();

http://git-wip-us.apache.org/repos/asf/cxf/blob/48c7e42b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
new file mode 100644
index 000..99a7436
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
@@ -0,0 +1,43 @@
+/**
+ * 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.failover;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class LoadDistributorServer extends AbstractBusTestServerBase {
+protected void run()  {
+URL busFile = Server.class.getResource("cxf-lb-service.xml");
+Bus busLocal = new SpringBusFactory().createBus(busFile);
+BusFactory.setDefaultBus(busLocal);
+setBus(busLocal);
+
+try {
+new Server();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/48c7e42b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
new file mode 100644
index 000..03ce218
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the

[1/2] cxf git commit: Adding WebClient Failover test

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d5a9d4cf4 -> 48c7e42bc


Adding WebClient Failover test


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

Branch: refs/heads/3.1.x-fixes
Commit: 40ffec36812a804ab87142153bcc5d3fa0c7d841
Parents: d5a9d4c
Author: Colm O hEigeartaigh 
Authored: Fri Mar 31 12:52:41 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 13:11:21 2017 +0100

--
 .../jaxrs/failover/FailoverBookServer.java  | 43 ++
 .../jaxrs/failover/FailoverBookStore.java   | 47 +++
 .../jaxrs/failover/FailoverWebClientTest.java   | 83 
 .../cxf/systest/jaxrs/failover/cxf-service.xml  | 75 ++
 4 files changed, 248 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/40ffec36/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
new file mode 100644
index 000..34e99b3
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
@@ -0,0 +1,43 @@
+/**
+ * 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.failover;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class FailoverBookServer extends AbstractBusTestServerBase {
+protected void run()  {
+URL busFile = Server.class.getResource("cxf-service.xml");
+Bus busLocal = new SpringBusFactory().createBus(busFile);
+BusFactory.setDefaultBus(busLocal);
+setBus(busLocal);
+
+try {
+new Server();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/40ffec36/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
new file mode 100644
index 000..29b5432
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
@@ -0,0 +1,47 @@
+/**
+ * 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.failover;
+
+
+import javax.ws.rs.GET;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.Path;
+
+import org.apache.cxf.systest.jaxrs.Book;
+
+/**
+ * Just allow one invocation + then return 404
+ */
+@Path("/bookstore")
+public class FailoverBookStore {
+
+private int counter;
+
+@GET
+@Path("/")
+

cxf git commit: [CXF-7312] Updating REQUEST_URI if needed

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 5bbe67eda -> d5a9d4cf4


[CXF-7312] Updating REQUEST_URI if needed


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

Branch: refs/heads/3.1.x-fixes
Commit: d5a9d4cf4fb531075f9064c8f8aecaf50407aa96
Parents: 5bbe67e
Author: Sergey Beryozkin 
Authored: Mon Apr 3 13:07:36 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 13:08:13 2017 +0100

--
 .../main/java/org/apache/cxf/clustering/FailoverTargetSelector.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d5a9d4cf/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
--
diff --git 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
index 5379416..c56b6bf 100644
--- 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
+++ 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
@@ -386,6 +386,7 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 endpointAddress = endpointAddress + (startsWithSlash ? 
pathInfo : (slash + pathInfo));
 }
 message.put(Message.ENDPOINT_ADDRESS, endpointAddress);
+message.put(Message.REQUEST_URI, endpointAddress);
 
 Exchange exchange = message.getExchange();
 InvocationKey key = new InvocationKey(exchange);

cxf git commit: [CXF-7312] Updating REQUEST_URI if needed

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master cbf0ca69e -> 443b9ae19


[CXF-7312] Updating REQUEST_URI if needed


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

Branch: refs/heads/master
Commit: 443b9ae1920f89723f42c519ceba6dc5bd2ff8fb
Parents: cbf0ca6
Author: Sergey Beryozkin 
Authored: Mon Apr 3 13:07:36 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 13:07:36 2017 +0100

--
 .../main/java/org/apache/cxf/clustering/FailoverTargetSelector.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/443b9ae1/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
--
diff --git 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
index de8abf1..7ab8b6f 100644
--- 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
+++ 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
@@ -402,6 +402,7 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 endpointAddress = endpointAddress + (startsWithSlash ? 
pathInfo : (slash + pathInfo));
 }
 message.put(Message.ENDPOINT_ADDRESS, endpointAddress);
+message.put(Message.REQUEST_URI, endpointAddress);
 
 Exchange exchange = message.getExchange();
 InvocationKey key = new InvocationKey(exchange);

cxf git commit: Updating to WSS4J release

2017-04-03 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 9c3ae3276 -> 5bbe67eda


Updating to WSS4J release


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

Branch: refs/heads/3.1.x-fixes
Commit: 5bbe67eda56223ae69a8c1fd7e805d76719cc829
Parents: 9c3ae32
Author: Colm O hEigeartaigh 
Authored: Mon Apr 3 12:32:26 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 3 12:32:26 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/5bbe67ed/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7ef8437..fe60e2b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -161,7 +161,7 @@
 4.4.1
 3.1.4
 1.6.3
-2.1.9-SNAPSHOT
+2.1.9
 2.11.0
 2.6.0
 2.2.1

cxf git commit: [CXF-7310] Updating ClientProxyImpl to parse individual accept values same was it is done with Path

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e85582a9b -> f0edf07ad


[CXF-7310] Updating ClientProxyImpl to parse individual accept values same was 
it is done with Path


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

Branch: refs/heads/3.0.x-fixes
Commit: f0edf07adc9e94f6f99a77282dcd8d6df4b2499e
Parents: e85582a
Author: Sergey Beryozkin 
Authored: Mon Apr 3 11:55:50 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 11:57:24 2017 +0100

--
 .../src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f0edf07a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 995b295..5ad3ba9 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -391,7 +391,7 @@ public class ClientProxyImpl extends AbstractClient 
implements
 }
 List types = new ArrayList();
 for (String s : headers) {
-types.add(JAXRSUtils.toMediaType(s));
+types.addAll(JAXRSUtils.parseMediaTypes(s));
 }
 return types;
 }

cxf git commit: [CXF-7310] Updating ClientProxyImpl to parse individual accept values same was it is done with Path

2017-04-03 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master f03e63133 -> cbf0ca69e


[CXF-7310] Updating ClientProxyImpl to parse individual accept values same was 
it is done with Path


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

Branch: refs/heads/master
Commit: cbf0ca69edb54ce58fc8063dfaa03fa497004ec6
Parents: f03e631
Author: Sergey Beryozkin 
Authored: Mon Apr 3 11:55:50 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 3 11:55:50 2017 +0100

--
 .../src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cbf0ca69/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 99bf10b..35a4c78 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -396,7 +396,7 @@ public class ClientProxyImpl extends AbstractClient 
implements
 }
 List types = new ArrayList<>();
 for (String s : headers) {
-types.add(JAXRSUtils.toMediaType(s));
+types.addAll(JAXRSUtils.parseMediaTypes(s));
 }
 return types;
 }