date:20160427

cxf git commit: Recording .gitmergeinfo Changes

2016-04-27 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 122784a76 -> 4ad3997c3


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

Branch: refs/heads/3.0.x-fixes
Commit: 4ad3997c3d75756fb346f1f8ac22a39b0c45cfa6
Parents: 122784a
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 17:37:21 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 17:37:21 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/4ad3997c/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6ac547f..e0ddde0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -292,6 +292,7 @@ B 4fe7844935f9b4ad797760613d143949f9448905
 B 4ff4cf5f28b22bc85cc107a9d31545c53c04845a
 B 5015c0c1ccb3bda0d83570c8b0e9889900d68221
 B 504b427081cfc2213ce0a5c050b16af67ca7ff46
+B 50daa4883dc8078a018ebc985e5c7bd58c6c5ff1
 B 512e9e900f3c840e1b0ab4c2fb4c3950bffc84ad
 B 51f433d54a1d11eac25c32b0dd69f12fef62c060
 B 52c3b6a90314086ece3b7f6df63465434879b2cd

cxf git commit: Adding JWTRequest tests

2016-04-27 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/master ee6e9e7d0 -> b630ca48a


Adding JWTRequest tests


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

Branch: refs/heads/master
Commit: b630ca48a8a0c073d2f90a700b4ee1c301f8c526
Parents: ee6e9e7
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 17:33:11 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 17:33:11 2016 +0100

--
 .../security/oauth2/common/OAuth2TestUtils.java |  91 ---
 .../jaxrs/security/oidc/OIDCFlowTest.java   | 116 +--
 .../systest/jaxrs/security/oidc/oidc-server.xml |  20 
 3 files changed, 203 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b630ca48/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
index 3ab095d..073c0df 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
@@ -69,29 +69,37 @@ public final class OAuth2TestUtils {
 
 public static String getAuthorizationCode(WebClient client, String scope, 
String consumerId,
   String nonce, String state) {
-String location = getLocation(client, scope, consumerId, nonce, state, 
"code", "authorize/");
+AuthorizationCodeParameters parameters = new 
AuthorizationCodeParameters();
+parameters.setConsumerId(consumerId);
+parameters.setScope(scope);
+parameters.setNonce(nonce);
+parameters.setState(state);
+parameters.setResponseType("code");
+parameters.setPath("authorize/");
+String location = getLocation(client, parameters);
 return getSubstring(location, "code");
 }
 
-public static String getLocation(WebClient client, String scope, String 
consumerId,
-  String nonce, String state, 
String responseType,
-  String path) {
+public static String getLocation(WebClient client, 
AuthorizationCodeParameters parameters) { 
 // Make initial authorization request
 client.type("application/json").accept("application/json");
-client.query("client_id", consumerId);
+client.query("client_id", parameters.getConsumerId());
 client.query("redirect_uri", "http://www.blah.apache.org;);
-client.query("response_type", responseType);
-if (scope != null) {
-client.query("scope", scope);
+client.query("response_type", parameters.getResponseType());
+if (parameters.getScope() != null) {
+client.query("scope", parameters.getScope());
 }
-if (nonce != null) {
-client.query("nonce", nonce);
+if (parameters.getNonce() != null) {
+client.query("nonce", parameters.getNonce());
 }
-if (state != null) {
-client.query("state", state);
+if (parameters.getState() != null) {
+client.query("state", parameters.getState());
+}
+if (parameters.getRequest() != null) {
+client.query("request", parameters.getRequest());
 }
 
-client.path(path);
+client.path(parameters.getPath());
 Response response = client.get();
 
 OAuthAuthorizationData authzData = 
response.readEntity(OAuthAuthorizationData.class);
@@ -118,8 +126,8 @@ public final class OAuth2TestUtils {
 
 response = client.post(form);
 String location = response.getHeaderString("Location");
-if (state != null) {
-Assert.assertTrue(location.contains("state=" + state));
+if (parameters.getState() != null) {
+Assert.assertTrue(location.contains("state=" + 
parameters.getState()));
 }
 
 return location;
@@ -243,4 +251,57 @@ public final class OAuth2TestUtils {
 }
 return foundString.substring(0, ampersandIndex);
 }
+
+public static class AuthorizationCodeParameters {
+private String scope;
+private String consumerId;
+private String nonce;
+private String state;
+

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

2016-04-27 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 82591273f -> 122784a76


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

Branch: refs/heads/3.0.x-fixes
Commit: ae36b9661effcc4d5e4ae271b5c022abdd43a830
Parents: 0da2a5e
Author: Colm O hEigeartaigh 
Authored: Tue Apr 26 22:32:38 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue Apr 26 22:32:38 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/ae36b966/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d8538b6..a0a6705 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -972,6 +972,7 @@ M 3a1b80659af65063b8c8aa5bbc79cd2a888c8685
 M 3a8a24326d690c8e0b58631b9428e3b460918ab5
 M 3ad862c9dea70ed20a9950d2883de0a8c2510fdd
 M 3af7c785c642db6ae64276f92fb05450d7f9aba3
+M 3b45e6080b782eb59395e9093627d4c687fb1151
 M 3d3d495a2c58164abfb54b64208b3f72b4d235dd
 M 3e648504409d9fbe56a92b62a7b0f581211ef7f2
 M 409188bcc94490f9cd60d6871f853b34e031f300

[3/3] cxf git commit: Recording .gitmergeinfo Changes

2016-04-27 Thread coheigea

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

Branch: refs/heads/3.0.x-fixes
Commit: 122784a7677ae9752e41ee7a730077df623106ca
Parents: ae36b96
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 16:43:27 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 16:43:27 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/122784a7/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a0a6705..6ac547f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -169,6 +169,7 @@ B 2fe88ec153b6193a8c80f7c1226db19600e0839a
 B 3019c331c0f069ed63611b5263df3ee4d427e4a7
 B 3051c2a54adc909be8d63c690b1444eb2f9e5e35
 B 30853113b4c4d47200bcf5305e5e88735f32cc8f
+B 30ad57d5590257960030161c2bd20ab4131d9c7b
 B 3134609dcd0443d4007a7829df57c148fff947b3
 B 315e357e850407e9f3233259bab33ea765633271
 B 321b2f8b66bf6b9d1fa68aba086c8cddf18070e3
@@ -637,6 +638,7 @@ B b4536602d376a36bcbd02d21d5ab42f19d4e5b22
 B b4872363fda49f205001d4385ecbc35133c2c755
 B b48c79cc187d16a81e45be8a24e56437a0df56e3
 B b4a17ce9970cd124cec61eaed04061a529e2398f
+B b4a1e352028e992ce6ff8f71666467ea4f96d7f8
 B b4bfa886ee80b681b09eb578c69a03a43ea964e2
 B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48
 B b5fc90f09c6b039a54564e0825a264310453c550
@@ -668,6 +670,7 @@ B bc025f0fe4acf7191430230080318346272543e1
 B bc5bbe8959a6767051b58a41b24a7d748b67fa84
 B bc752dc5bd89b5d70d00435fc1185e72659d7e4d
 B bc9e3714adc8848f37694eea62d33748b01fbb91
+B bca5ead51899b3aa4864d8b4a675c829096bcd3b
 B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
 B bd94b4c8778e360d538d5acb3f6a3710af92e6f1
 B bdd359af4de505f7bbe50bf9990da5788e12fd71
@@ -676,6 +679,7 @@ B be4e40a46784d81c559b073b487255cf87334a77
 B bea22d764138e365513856c23be760a7719530a0
 B beb4af748ff260ccbe2ac29a0a251ebcbe77ab8c
 B bec40a5178e4ce6a434830589d5e44f62961cabb
+B bec482729cf3c0938658cbe2ccb542e1a9ab034d
 B bee2c0d849c4cffd396eaafbe710ddfb499c7a18
 B bef3d8408feb07365e17ca6960db7b4b2f1436ec
 B bf3d1faa9ea33419f0e1bac90cecc7bba112dd5c

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

2016-04-27 Thread coheigea

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

Branch: refs/heads/3.1.x-fixes
Commit: b4a1e352028e992ce6ff8f71666467ea4f96d7f8
Parents: bec4827
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 14:36:07 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 14:36:07 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/b4a1e352/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9d2ac0d..0aaee81 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -65,6 +65,7 @@ M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
 M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81
 M 8118c5a301f22dea16c9d235ad378584a0ae2466
 M 8583a24ac541dc373503d7a6c59cd90890acdae3
+M 896f1abec915897967905762d6e850cfb6bac3bc
 M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
 M 8e131133c8566a124605cb06e0b6db98fddb5972
 M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1

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

2016-04-27 Thread coheigea

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

Branch: refs/heads/3.1.x-fixes
Commit: 30ad57d5590257960030161c2bd20ab4131d9c7b
Parents: b4a1e35
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 15:49:12 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 15:49:12 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/30ad57d5/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0aaee81..fc95715 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -43,6 +43,7 @@ B e1c60863ac10b56d423613c7d3d2f45c7ce18e14
 B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52
 B e6f0722615190861192972a51b3986b34efd1f0e
 B ec3103f88b20fc05e92994b6a06b65b4a91dd75a
+B ee6e9e7d037de08ebc4a017ca7525d3ca67d2adb
 B efb1f0830f5441777198737fb26e9305ab969f66
 B f0e08b7bea2660542e18294d490e68c7b14aaa4b
 B f1b56150d6520e73d2ade2296c3b2f13839e63e5

[2/4] cxf git commit: Updating a few dependencies

2016-04-27 Thread coheigea

Updating a few dependencies

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

Branch: refs/heads/3.1.x-fixes
Commit: bec482729cf3c0938658cbe2ccb542e1a9ab034d
Parents: bca5ead
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 14:30:43 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 14:36:07 2016 +0100

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bec48272/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0bba8d4..817f37b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -91,7 +91,7 @@
 
4.5.2
 
4.4.4
 
[4.3,4.5.0)
-2.6.5
+2.6.6
 0.7.2
 1.0.13
 1.2.17
@@ -138,7 +138,7 @@
 1.0
 
geronimo-servlet_2.5_spec
 1.1.2
-1.7.19
+1.7.21
 1.2
 4.1.9.RELEASE
 
3.2.9.RELEASE

[1/4] cxf git commit: More stream work

2016-04-27 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3b45e6080 -> 30ad57d55


More stream work


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

Branch: refs/heads/3.1.x-fixes
Commit: bca5ead51899b3aa4864d8b4a675c829096bcd3b
Parents: 3b45e60
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 11:40:37 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 14:31:06 2016 +0100

--
 .../org/apache/cxf/staxutils/StaxUtilsTest.java |  2 ++
 .../org/apache/cxf/tools/util/PropertyUtil.java | 30 ++--
 .../tools/validator/internal/Stax2DOMTest.java  |  6 ++--
 3 files changed, 20 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bca5ead5/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
--
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java 
b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index 818d262..eda6049 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -111,6 +111,7 @@ public class StaxUtilsTest extends Assert {

 // write output to a string
 String output = baos.toString();   
+baos.close();
 
 // re-read the input xml doc to a string
 InputStreamReader inputStreamReader = new 
InputStreamReader(getTestStream(soapMessage));
@@ -123,6 +124,7 @@ public class StaxUtilsTest extends Assert {
 n = inputStreamReader.read(buffer);
 }
 String input = stringWriter.toString();
+stringWriter.close();
 // seach for the first begin of "  maps = new HashMap();
 
 public void load(InputStream is, String delim) throws IOException {
-BufferedReader br = new BufferedReader(new InputStreamReader(is));
-String line = br.readLine();
-while (!StringUtils.isEmpty(line)) {
-StringTokenizer st = new StringTokenizer(line, delim);
-String key = null;
-String value = null;
-if (st.hasMoreTokens()) {
-key  = st.nextToken().trim();
-}
-if (st.hasMoreTokens()) {
-value = st.nextToken().trim();
-}
+try (BufferedReader br = new BufferedReader(new 
InputStreamReader(is))) {
+String line = br.readLine();
+while (!StringUtils.isEmpty(line)) {
+StringTokenizer st = new StringTokenizer(line, delim);
+String key = null;
+String value = null;
+if (st.hasMoreTokens()) {
+key  = st.nextToken().trim();
+}
+if (st.hasMoreTokens()) {
+value = st.nextToken().trim();
+}
 
-maps.put(key, value);
+maps.put(key, value);
 
-line = br.readLine();
+line = br.readLine();
+}
 }
-br.close();
 }
 
 public void load(InputStream is) throws IOException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/bca5ead5/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
--
diff --git 
a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
 
b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
index c0b4141..7340fcc 100644
--- 
a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
+++ 
b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
@@ -83,9 +83,9 @@ public class

cxf git commit: Squaring httpcomponent dep with 3.1

2016-04-27 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/master f2845b37c -> ee6e9e7d0


Squaring httpcomponent dep with 3.1


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

Branch: refs/heads/master
Commit: ee6e9e7d037de08ebc4a017ca7525d3ca67d2adb
Parents: f2845b3
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 15:46:50 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 15:48:18 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/ee6e9e7d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b7ad82..0a17062 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -89,7 +89,7 @@
 
4.1.1
 
[4.0,4.2)
 
4.5.2
-
4.4.1
+
4.4.4
 
[4.3,4.5.0)
 2.6.6
 0.7.2

cxf git commit: Make sure local build use local snapshots for index

2016-04-27 Thread cschneider

Repository: cxf
Updated Branches:
  refs/heads/master 896f1abec -> f2845b37c


Make sure local build use local snapshots for index


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

Branch: refs/heads/master
Commit: f2845b37c6e7042470f869edc2ce9138f83d616f
Parents: 896f1ab
Author: Christian Schneider 
Authored: Wed Apr 27 16:01:31 2016 +0200
Committer: Christian Schneider 
Committed: Wed Apr 27 16:01:31 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/f2845b37/osgi/repository/pom.xml
--
diff --git a/osgi/repository/pom.xml b/osgi/repository/pom.xml
index 45a5441..b5b5d4a 100644
--- a/osgi/repository/pom.xml
+++ b/osgi/repository/pom.xml
@@ -31,7 +31,7 @@

3.1.0

UTF-8
-   ALLOWED
+   REQUIRED

[1/2] cxf git commit: More stream work

2016-04-27 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/master 811f40df5 -> 896f1abec


More stream work


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

Branch: refs/heads/master
Commit: ae4e8cf0c44b231d1068da304acbe5453f02e5ca
Parents: 811f40d
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 11:40:37 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 11:40:37 2016 +0100

--
 .../org/apache/cxf/staxutils/StaxUtilsTest.java |  2 ++
 .../org/apache/cxf/tools/util/PropertyUtil.java | 30 ++--
 .../tools/validator/internal/Stax2DOMTest.java  |  6 ++--
 3 files changed, 20 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ae4e8cf0/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
--
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java 
b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index 818d262..eda6049 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -111,6 +111,7 @@ public class StaxUtilsTest extends Assert {

 // write output to a string
 String output = baos.toString();   
+baos.close();
 
 // re-read the input xml doc to a string
 InputStreamReader inputStreamReader = new 
InputStreamReader(getTestStream(soapMessage));
@@ -123,6 +124,7 @@ public class StaxUtilsTest extends Assert {
 n = inputStreamReader.read(buffer);
 }
 String input = stringWriter.toString();
+stringWriter.close();
 // seach for the first begin of "  maps = new HashMap();
 
 public void load(InputStream is, String delim) throws IOException {
-BufferedReader br = new BufferedReader(new InputStreamReader(is));
-String line = br.readLine();
-while (!StringUtils.isEmpty(line)) {
-StringTokenizer st = new StringTokenizer(line, delim);
-String key = null;
-String value = null;
-if (st.hasMoreTokens()) {
-key  = st.nextToken().trim();
-}
-if (st.hasMoreTokens()) {
-value = st.nextToken().trim();
-}
+try (BufferedReader br = new BufferedReader(new 
InputStreamReader(is))) {
+String line = br.readLine();
+while (!StringUtils.isEmpty(line)) {
+StringTokenizer st = new StringTokenizer(line, delim);
+String key = null;
+String value = null;
+if (st.hasMoreTokens()) {
+key  = st.nextToken().trim();
+}
+if (st.hasMoreTokens()) {
+value = st.nextToken().trim();
+}
 
-maps.put(key, value);
+maps.put(key, value);
 
-line = br.readLine();
+line = br.readLine();
+}
 }
-br.close();
 }
 
 public void load(InputStream is) throws IOException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/ae4e8cf0/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
--
diff --git 
a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
 
b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
index c0b4141..7340fcc 100644
--- 
a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
+++ 
b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
@@ -83,9 +83,9 @@ public class Stax2DOMTest

[2/2] cxf git commit: Updating a few dependencies

2016-04-27 Thread coheigea

Updating a few dependencies


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

Branch: refs/heads/master
Commit: 896f1abec915897967905762d6e850cfb6bac3bc
Parents: ae4e8cf
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 14:30:43 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 14:30:43 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/896f1abe/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9e97a5b..9b7ad82 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -86,12 +86,12 @@
 
1.2.13_1
 18.0
 1.9.4
-
4.1
+
4.1.1
 
[4.0,4.2)
-
4.5.1
+
4.5.2
 
4.4.1
 
[4.3,4.5.0)
-2.6.5
+2.6.6
 0.7.2
 1.0.13
 1.2.17
@@ -140,7 +140,7 @@
 1.0
 
geronimo-servlet_2.5_spec
 1.1.2
-1.7.19
+1.7.21
 1.2
 4.1.9.RELEASE
 
3.2.9.RELEASE

[2/2] cxf-fediz git commit: Updating Commons IO

2016-04-27 Thread coheigea

Updating Commons IO


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

Branch: refs/heads/1.2.x-fixes
Commit: 89fd6cc4ed970e88555e06987aa216082bde99f6
Parents: d3d58ad
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 12:57:31 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 13:06:50 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/89fd6cc4/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 276ca58..597ed22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 1.54
 3.4
 1.2
-2.4
+2.5
 1.5.0
 3.0.9
 3.0.0

[1/2] cxf-fediz git commit: Updating some dependencies

2016-04-27 Thread coheigea

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 54fc13679 -> 89fd6cc4e


Updating some dependencies


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

Branch: refs/heads/1.2.x-fixes
Commit: d3d58ad6feaf32b8190c777b5aa732c8cc9bd180
Parents: 54fc136
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 11:49:21 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 12:20:47 2016 +0100

--
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d3d58ad6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3caa2dc..276ca58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,13 +59,13 @@
 8.1.19.v20160209
 4.12
 1.2.17
-3.1.2
-2.4.0
+3.1.4
+2.4.1
 2.5
-1.7.14
+1.7.21
 3.2.8.RELEASE
 3.1.7.RELEASE
-7.0.68
+7.0.69
 2.0.7
 2.7.2
 0.5

cxf-fediz git commit: Updating Commons IO

2016-04-27 Thread coheigea

Repository: cxf-fediz
Updated Branches:
  refs/heads/master a7a509868 -> 88d176a57


Updating Commons IO


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

Branch: refs/heads/master
Commit: 88d176a576b5cbb7242152faa2a38062507740a1
Parents: a7a5098
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 12:57:31 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 12:57:31 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/88d176a5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 231068e..acaf2fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 1.1.1
 3.4
 1.2
-2.4
+2.5
 1.5.0
 3.1.7-SNAPSHOT
 3.2.0

[1/2] cxf-fediz git commit: @Ignoring some failing OIDC systests due to JPA issues

2016-04-27 Thread coheigea

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 2f401b311 -> a7a509868


@Ignoring some failing OIDC systests due to JPA issues


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

Branch: refs/heads/master
Commit: 88d3071c5557c6b154c4ceabcd34de05f628a2c4
Parents: 2f401b3
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 11:04:48 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 11:04:48 2016 +0100

--
 .../test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/88d3071c/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
--
diff --git 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
index ccb3bc9..0ef10a1 100644
--- 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
+++ 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
@@ -408,7 +408,9 @@ public class OIDCTest {
 webClient.close();
 }
 
+// TODO @Ignoring failing test for now
 @org.junit.Test
+@org.junit.Ignore
 public void testOIDCLoginForClient2() throws Exception {
 
 String url = "https://localhost:; + getRpHttpsPort() + 
"/fediz-oidc/idp/authorize?";
@@ -445,7 +447,9 @@ public class OIDCTest {
 webClient.close();
 }
 
+// TODO @Ignoring failing test for now
 @org.junit.Test
+@org.junit.Ignore
 public void testUsingCodeForOtherClient() throws Exception {
 // Get the code for the first client
 String url = "https://localhost:; + getRpHttpsPort() + 
"/fediz-oidc/idp/authorize?";

[2/2] cxf-fediz git commit: Updating some dependencies

2016-04-27 Thread coheigea

Updating some dependencies


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

Branch: refs/heads/master
Commit: a7a509868d9a9dc0b3b1cdf59ac3881b2c39a245
Parents: 88d3071
Author: Colm O hEigeartaigh 
Authored: Wed Apr 27 11:49:21 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 27 11:49:21 2016 +0100

--
 pom.xml | 14 -
 services/oidc/pom.xml   |  2 +-
 .../cxf/fediz/integrationtests/OIDCTest.java| 31 
 3 files changed, 21 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a7a50986/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1f411e5..231068e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,11 +47,11 @@
 3.1.7-SNAPSHOT
 3.2.0
 3.4
-4.4.2
+4.5.1
 2.9.0
 4.3.5
 2.3.3
-2.19
+2.21
 3.16.1-GA
 2.2
 1.1.0.Final
@@ -60,14 +60,14 @@
 9.3.7.v20160115
 4.12
 1.2.17
-3.1.2
-2.4.0
+3.1.4
+2.4.1
 2.5
-1.7.19
+1.7.21
 4.1.9.RELEASE
 3.2.9.RELEASE
-7.0.68
-8.0.32
+7.0.69
+8.0.33
 2.1.5
 2.7.2
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a7a50986/services/oidc/pom.xml
--
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index 5374499..a0f9cca 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -65,7 +65,7 @@
 
 org.apache.geronimo.specs
 geronimo-jpa_2.0_spec
-1.0
+1.1
 
 
 org.springframework

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a7a50986/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
--
diff --git 
a/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
 
b/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
index 4110355..ec8b7e8 100644
--- 
a/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
+++ 
b/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
@@ -27,8 +27,6 @@ import java.util.ArrayList;
 
 import javax.servlet.ServletException;
 
-import org.w3c.dom.Element;
-
 import com.gargoylesoftware.htmlunit.CookieManager;
 import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -37,7 +35,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
-import com.gargoylesoftware.htmlunit.xml.XmlPage;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
@@ -237,24 +234,22 @@ public class OIDCTest {
 webClient.getOptions().setJavaScriptEnabled(false);
 
 // The decision page is returned as XML for some reason. So parse it 
and send a form response back.
-XmlPage oidcIdpConfirmationPage = webClient.getPage(url);
-
-Element clientId = 
(Element)oidcIdpConfirmationPage.getByXPath("//clientId").get(0);
-Element redirectUri = 
(Element)oidcIdpConfirmationPage.getByXPath("//redirectUri").get(0);
-Element scope = 
(Element)oidcIdpConfirmationPage.getByXPath("//proposedScope").get(0);
-Element state = 
(Element)oidcIdpConfirmationPage.getByXPath("//state").get(0);
-Element authenticityToken = 
(Element)oidcIdpConfirmationPage.getByXPath("//authenticityToken").get(0);
-Element replyTo = 
(Element)oidcIdpConfirmationPage.getByXPath("//replyTo").get(0);
+HtmlPage oidcIdpConfirmationPage = webClient.getPage(url);
+final HtmlForm oidcForm = oidcIdpConfirmationPage.getForms().get(0);
 
-WebRequest request = new WebRequest(new URL(replyTo.getTextContent()), 
HttpMethod.POST);
+WebRequest request = new WebRequest(new 
URL(oidcForm.getActionAttribute()), HttpMethod.POST);
 
 request.setRequestParameters(new ArrayList());
-request.getRequestParameters().add(new NameValuePair("client_id", 
clientId.getTextContent()));
-

cxf git commit: Recording .gitmergeinfo Changes

cxf git commit: Adding JWTRequest tests

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

[3/3] cxf git commit: Recording .gitmergeinfo Changes

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

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

[2/4] cxf git commit: Updating a few dependencies

[1/4] cxf git commit: More stream work

cxf git commit: Squaring httpcomponent dep with 3.1

cxf git commit: Make sure local build use local snapshots for index

[1/2] cxf git commit: More stream work

[2/2] cxf git commit: Updating a few dependencies

[2/2] cxf-fediz git commit: Updating Commons IO

[1/2] cxf-fediz git commit: Updating some dependencies

cxf-fediz git commit: Updating Commons IO

[1/2] cxf-fediz git commit: @Ignoring some failing OIDC systests due to JPA issues

[2/2] cxf-fediz git commit: Updating some dependencies

17 matches

Site Navigation

Mail list logo

Footer information