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

2016-04-06 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes adb0ce538 -> 708f53f7a


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

Branch: refs/heads/3.1.x-fixes
Commit: 708f53f7af5a53003f642a4422d8c11de18f8889
Parents: 210bd76
Author: Daniel Kulp 
Authored: Wed Apr 6 15:29:17 2016 -0400
Committer: Daniel Kulp 
Committed: Wed Apr 6 15:29:17 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/708f53f7/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 77e28a9..241bd31 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -56,6 +56,7 @@ M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
 M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
 M 386805560479b35276d88605c5acf805e3004aa5
 M 39c772a0764b323f98ab58e00345f4fca924c425
+M 4799fef822a96f5d1b2827d5cc42ab886fd4e673
 M 63a1088a9253da0452497440e900d35a5415c3c9
 M 7304dfbd8f3044d8d46981abf2058c6cb732d219
 M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
@@ -71,5 +72,6 @@ M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
 M a1710bdd783afcd667d9e72ccb031480d3806850
 M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
+M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
 M fa973bd7ab43099151f83beea351b80c7140eaab
 M fe89bf0fb8379428667f66312e6942e906142d6f

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

2016-04-06 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/master 27a7508f0 -> 3a461f1db


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


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

Branch: refs/heads/master
Commit: 3a461f1db7b51fa47a895dadb1b0df2830ce9ca5
Parents: 27a7508
Author: Jeroen van der Last 
Authored: Tue Apr 5 16:30:58 2016 +0200
Committer: Daniel Kulp 
Committed: Wed Apr 6 15:14:11 2016 -0400

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


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

cxf git commit: #CXF-6859: logging and exception handling improvement

2016-04-06 Thread ashakirin 
Repository: cxf
Updated Branches:
  refs/heads/master f4bc11621 -> 584a21740


#CXF-6859: logging and exception handling improvement


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

Branch: refs/heads/master
Commit: 584a217406757a2994c27cfb3d4ef38323aec40f
Parents: f4bc116
Author: Andrei Shakirin 
Authored: Wed Apr 6 20:59:26 2016 +0200
Committer: Andrei Shakirin 
Committed: Wed Apr 6 20:59:26 2016 +0200

--
 .../cxf/ws/security/trust/STSSamlAssertionValidator.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/584a2174/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java
index 8805df1..33236e3 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java
@@ -19,6 +19,10 @@
 
 package org.apache.cxf.ws.security.trust;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.dom.handler.RequestData;
@@ -32,6 +36,7 @@ import org.apache.wss4j.dom.validate.SamlAssertionValidator;
  * for validation.
  */
 public class STSSamlAssertionValidator extends SamlAssertionValidator {
+private static final Logger LOG = 
LogUtils.getL7dLogger(STSSamlAssertionValidator.class);
 
 private boolean trustVerificationSucceeded;
 
@@ -64,6 +69,7 @@ public class STSSamlAssertionValidator extends 
SamlAssertionValidator {
 trustVerificationSucceeded = true;
 return credential;
 } catch (WSSecurityException ex) {
+LOG.log(Level.WARNING, "Trust verification of SAML assertion 
failed: " + ex.getMessage(), ex);
 trustVerificationSucceeded = false;
 return null;
 }

cxf-fediz git commit: [FEDIZ-161] - FederationConfigImpl.init() calls loadConfig(File) which fails for war files with special characters in its name

2016-04-06 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 994fcc8f2 -> 54ad62c98


[FEDIZ-161] - FederationConfigImpl.init() calls loadConfig(File) which fails 
for war files with special characters in its name


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

Branch: refs/heads/1.2.x-fixes
Commit: 54ad62c98b1085bfcc3535e007dfa5beed3af276
Parents: 994fcc8
Author: Colm O hEigeartaigh 
Authored: Wed Apr 6 17:50:23 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 6 18:03:55 2016 +0100

--
 .../org/apache/cxf/fediz/core/config/FedizConfigurator.java   | 6 --
 .../org/apache/cxf/fediz/jetty/FederationAuthenticator.java   | 7 +++
 .../org/apache/cxf/fediz/tomcat/FederationAuthenticator.java  | 3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/54ad62c9/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
--
diff --git 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
index d69b73a..8cd0b91 100644
--- 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
+++ 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
@@ -20,6 +20,8 @@
 package org.apache.cxf.fediz.core.config;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.ArrayList;
@@ -39,8 +41,8 @@ public class FedizConfigurator {
 
 private List fedizContextList;
 
-public FedizConfig loadConfig(File f) throws JAXBException {
-rootConfig = (FedizConfig) 
getJaxbContext().createUnmarshaller().unmarshal(f);
+public FedizConfig loadConfig(File f) throws JAXBException, 
FileNotFoundException {
+rootConfig = (FedizConfig) 
getJaxbContext().createUnmarshaller().unmarshal(new FileInputStream(f));
 parseFedizContextList();
 return rootConfig;
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/54ad62c9/plugins/jetty/src/main/java/org/apache/cxf/fediz/jetty/FederationAuthenticator.java
--
diff --git 
a/plugins/jetty/src/main/java/org/apache/cxf/fediz/jetty/FederationAuthenticator.java
 
b/plugins/jetty/src/main/java/org/apache/cxf/fediz/jetty/FederationAuthenticator.java
index 10f99da..75b19ed 100644
--- 
a/plugins/jetty/src/main/java/org/apache/cxf/fediz/jetty/FederationAuthenticator.java
+++ 
b/plugins/jetty/src/main/java/org/apache/cxf/fediz/jetty/FederationAuthenticator.java
@@ -20,6 +20,7 @@
 package org.apache.cxf.fediz.jetty;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -124,6 +125,12 @@ public class FederationAuthenticator extends 
LoginAuthenticator {
 e);
 //throw new ServerAuthException("Failed to load Fediz 
configuration",
 //  e);
+} catch (FileNotFoundException e) {
+//[TODO] use other exception
+throw new RuntimeException("Failed to load Fediz configuration",
+e);
+//throw new ServerAuthException("Failed to load Fediz 
configuration",
+//  e);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/54ad62c9/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
--
diff --git 
a/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
 
b/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
index fb317de..7efd5ba 100644
--- 
a/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
+++ 
b/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
@@ -20,6 +20,7 @@
 package org.apache.cxf.fediz.tomcat;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.security.Principal;
 import java.util.Date;
@@ -125,6 +126,8 @@ public class FederationAuthenticator extends 
FormAuthenticator {
 LOG.debug("Fediz configuration read from " + f.getAbsolutePath());
 } catch

cxf-fediz git commit: [FEDIZ-161] - FederationConfigImpl.init() calls loadConfig(File) which fails for war files with special characters in its name

2016-04-06 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master d132e1b53 -> 4c20cefb8


[FEDIZ-161] - FederationConfigImpl.init() calls loadConfig(File) which fails 
for war files with special characters in its name


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

Branch: refs/heads/master
Commit: 4c20cefb8369a79f946b13ba7c8f2d03b605c1c5
Parents: d132e1b
Author: Colm O hEigeartaigh 
Authored: Wed Apr 6 17:50:23 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 6 17:50:23 2016 +0100

--
 .../org/apache/cxf/fediz/core/config/FedizConfigurator.java| 6 --
 .../org/apache/cxf/fediz/jetty8/FederationAuthenticator.java   | 3 ++-
 .../org/apache/cxf/fediz/jetty9/FederationAuthenticator.java   | 3 ++-
 .../org/apache/cxf/fediz/tomcat7/FederationAuthenticator.java  | 3 ++-
 .../org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java  | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4c20cefb/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
--
diff --git 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
index 3652a01..3e19f57 100644
--- 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
+++ 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
@@ -20,6 +20,8 @@
 package org.apache.cxf.fediz.core.config;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.ArrayList;
@@ -39,8 +41,8 @@ public class FedizConfigurator {
 
 private List fedizContextList;
 
-public FedizConfig loadConfig(File f) throws JAXBException {
-rootConfig = (FedizConfig) 
getJaxbContext().createUnmarshaller().unmarshal(f);
+public FedizConfig loadConfig(File f) throws JAXBException, 
FileNotFoundException {
+rootConfig = (FedizConfig) 
getJaxbContext().createUnmarshaller().unmarshal(new FileInputStream(f));
 parseFedizContextList();
 return rootConfig;
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4c20cefb/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java
--
diff --git 
a/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java
 
b/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java
index c9f69cb..6b206eb 100644
--- 
a/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java
+++ 
b/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java
@@ -20,6 +20,7 @@
 package org.apache.cxf.fediz.jetty8;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -115,7 +116,7 @@ public class FederationAuthenticator extends 
LoginAuthenticator {
 configurator = new FedizConfigurator();
 configurator.loadConfig(f);
 LOG.debug("Fediz configuration read from " + f.getAbsolutePath());
-} catch (JAXBException e) {
+} catch (JAXBException | FileNotFoundException e) {
 //[TODO] use other exception
 throw new RuntimeException("Failed to load Fediz configuration",
 e);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4c20cefb/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java
--
diff --git 
a/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java
 
b/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java
index df8f000..d25eced 100644
--- 
a/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java
+++ 
b/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java
@@ -20,6 +20,7 @@
 package org.apache.cxf.fediz.jetty9;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -114,7 +115,7 @@ public class FederationAuthenticator extends 
LoginAuthenticator {

cxf git commit: Some cleanup around saving refresh tokens

2016-04-06 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes cef686653 -> adb0ce538


Some cleanup around saving refresh tokens


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

Branch: refs/heads/3.1.x-fixes
Commit: adb0ce53862e37ccd2f16029c7b13b4fa0cb0ac9
Parents: cef6866
Author: Sergey Beryozkin 
Authored: Wed Apr 6 16:27:45 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Apr 6 16:28:35 2016 +0100

--
 .../oauth2/provider/AbstractOAuthDataProvider.java | 17 +
 .../provider/DefaultEHCacheOAuthDataProvider.java  |  2 +-
 .../DefaultEncryptingOAuthDataProvider.java| 10 +-
 .../oauth2/provider/JPAOAuthDataProvider.java  |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/adb0ce53/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index 00608e2..b5f7ebf 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -136,7 +136,7 @@ public abstract class AbstractOAuthDataProvider implements 
OAuthDataProvider, Cl
 if (rt.getAccessTokens().isEmpty()) {
 revokeRefreshToken(rt.getTokenKey());
 } else {
-saveRefreshToken(null, rt);
+saveRefreshToken(rt);
 }
 }
 
@@ -220,14 +220,14 @@ public abstract class AbstractOAuthDataProvider 
implements OAuthDataProvider, Cl
 }
  
 protected RefreshToken updateRefreshToken(RefreshToken rt, 
ServerAccessToken at) {
-linkRefreshAccessTokens(rt, at);
-saveRefreshToken(at, rt);
+linkAccessTokenToRefreshToken(rt, at);
+saveRefreshToken(rt);
+linkRefreshTokenToAccessToken(rt, at);
 return rt;
 }
 protected RefreshToken createNewRefreshToken(ServerAccessToken at) {
 RefreshToken rt = doCreateNewRefreshToken(at);
-saveRefreshToken(at, rt);
-return rt;
+return updateRefreshToken(rt, at);
 }
 protected RefreshToken doCreateNewRefreshToken(ServerAccessToken at) {
 RefreshToken rt = new RefreshToken(at.getClient(), 
refreshTokenLifetime);
@@ -244,12 +244,13 @@ public abstract class AbstractOAuthDataProvider 
implements OAuthDataProvider, Cl
 }
 rt.setSubject(at.getSubject());
 rt.setClientCodeVerifier(at.getClientCodeVerifier());
-linkRefreshAccessTokens(rt, at);
 return rt;
 }
 
-private void linkRefreshAccessTokens(RefreshToken rt, ServerAccessToken 
at) {
+protected void linkAccessTokenToRefreshToken(RefreshToken rt, 
ServerAccessToken at) {
 rt.getAccessTokens().add(at.getTokenKey());
+}
+protected void linkRefreshTokenToAccessToken(RefreshToken rt, 
ServerAccessToken at) {
 at.setRefreshToken(rt.getTokenKey());
 }
 
@@ -356,7 +357,7 @@ public abstract class AbstractOAuthDataProvider implements 
OAuthDataProvider, Cl
 
 
 protected abstract void saveAccessToken(ServerAccessToken serverToken);
-protected abstract void saveRefreshToken(ServerAccessToken at, 
RefreshToken refreshToken);
+protected abstract void saveRefreshToken(RefreshToken refreshToken);
 protected abstract void doRevokeAccessToken(ServerAccessToken accessToken);
 protected abstract void doRevokeRefreshToken(RefreshToken  refreshToken);
 protected abstract RefreshToken getRefreshToken(String refreshTokenKey);

http://git-wip-us.apache.org/repos/asf/cxf/blob/adb0ce53/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
index c6e65f3..7d376ed 100644
---

cxf git commit: Prototyping the code for saving code grants and refresh tokens

2016-04-06 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a83f0536b -> cef686653


Prototyping the code for saving code grants and refresh tokens


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

Branch: refs/heads/3.1.x-fixes
Commit: cef68665303f783fa25ae1ac974a3cb94732e228
Parents: a83f053
Author: Sergey Beryozkin 
Authored: Wed Apr 6 15:29:33 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Apr 6 15:30:27 2016 +0100

--
 .../grants/code/AuthorizationCodeGrant.java |   6 +
 .../oauth2/grants/code/JPACodeDataProvider.java |  64 +-
 .../code/ServerAuthorizationCodeGrant.java  |  13 +-
 .../provider/AbstractOAuthDataProvider.java |  13 +-
 .../oauth2/provider/JPAOAuthDataProvider.java   |  72 +--
 .../oauth2/tokens/refresh/RefreshToken.java |   6 +-
 .../grants/code/JPACodeDataProviderTest.java|  75 ++-
 .../provider/JPAOAuthDataProviderTest.java  | 215 +++
 .../src/test/resources/META-INF/persistence.xml |   2 +
 9 files changed, 376 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cef68665/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
index 80119f1..57a4595 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
@@ -20,6 +20,9 @@ package org.apache.cxf.rs.security.oauth2.grants.code;
 
 import java.net.URI;
 
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
 import javax.ws.rs.core.MultivaluedMap;
 
 import org.apache.cxf.jaxrs.impl.MetadataMap;
@@ -32,6 +35,7 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
  * Base Authorization Code Grant representation, captures the code 
  * and the redirect URI this code has been returned to, visible to the client
  */
+@MappedSuperclass
 public class AuthorizationCodeGrant implements AccessTokenGrant {
 private static final long serialVersionUID = -3738825769770411453L;
 private String code;
@@ -72,6 +76,7 @@ public class AuthorizationCodeGrant implements 
AccessTokenGrant {
  * Gets the authorization code
  * @return the code
  */
+@Id
 public String getCode() {
 return code;
 }
@@ -83,6 +88,7 @@ public class AuthorizationCodeGrant implements 
AccessTokenGrant {
 /**
  * {@inheritDoc}
  */
+@Transient
 public String getType() {
 return OAuthConstants.AUTHORIZATION_CODE_GRANT;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/cef68665/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
index 55b7de2..ba7a11a 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
@@ -20,32 +20,76 @@ package org.apache.cxf.rs.security.oauth2.grants.code;
 
 import java.util.List;
 
+import javax.persistence.NoResultException;
+import javax.persistence.TypedQuery;
+
 import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.UserSubject;
 import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
 import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
 
-public class JPACodeDataProvider extends JPAOAuthDataProvider 
-implements AuthorizationCodeDataProvider {
-
+public class JPACodeDataProvider extends JPAOAuthDataProvider implements 
AuthorizationCodeDataProvider {
+private static final String CODE_TABLE_NAME = 
ServerAuthorizationCodeGrant.class.getSimpleName();
+private

cxf git commit: Fixing samples

2016-04-06 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 47a5c5606 -> 20a3ddb13


Fixing samples


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

Branch: refs/heads/3.0.x-fixes
Commit: 20a3ddb13f3daac3f6d437491fda8b3618e2736c
Parents: 47a5c56
Author: Colm O hEigeartaigh 
Authored: Wed Apr 6 14:03:31 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 6 14:05:30 2016 +0100

--
 .../src/main/java/demo/hw/client/Get.java| 4 ++--
 .../src/main/java/demo/restful/client/Client.java| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/20a3ddb1/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
--
diff --git 
a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
 
b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
index 92f04c4..e47fdf5 100644
--- 
a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
+++ 
b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
@@ -104,8 +104,8 @@ public final class Get {
 Transformer transformer = transformerFactory.newTransformer();
 Properties oprops = new Properties();
 oprops.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
-trans.setOutputProperties(oprops);
-trans.transform(source, sr);
+transformer.setOutputProperties(oprops);
+transformer.transform(source, sr);
 System.out.println();
 System.out.println(" Response **");
 System.out.println();

http://git-wip-us.apache.org/repos/asf/cxf/blob/20a3ddb1/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
--
diff --git 
a/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
 
b/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
index 7f99764..ff28e4c 100644
--- 
a/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
+++ 
b/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
@@ -97,8 +97,8 @@ public final class Client {
 Transformer transformer = transformerFactory.newTransformer();
 Properties oprops = new Properties();
 oprops.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
-trans.setOutputProperties(oprops);
-trans.transform(source, sr);
+transformer.setOutputProperties(oprops);
+transformer.transform(source, sr);
 System.out.println(" Response **");
 System.out.println(bos.toString());
 bos.close();

cxf git commit: Fixing samples

2016-04-06 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 00646355e -> a83f0536b


Fixing samples


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

Branch: refs/heads/3.1.x-fixes
Commit: a83f0536b04313c75d40a07a8092004052e4304f
Parents: 0064635
Author: Colm O hEigeartaigh 
Authored: Wed Apr 6 14:03:31 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 6 14:03:45 2016 +0100

--
 .../src/main/java/demo/hw/client/Get.java| 4 ++--
 .../src/main/java/demo/restful/client/Client.java| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a83f0536/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
--
diff --git 
a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
 
b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
index 92f04c4..e47fdf5 100644
--- 
a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
+++ 
b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
@@ -104,8 +104,8 @@ public final class Get {
 Transformer transformer = transformerFactory.newTransformer();
 Properties oprops = new Properties();
 oprops.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
-trans.setOutputProperties(oprops);
-trans.transform(source, sr);
+transformer.setOutputProperties(oprops);
+transformer.transform(source, sr);
 System.out.println();
 System.out.println(" Response **");
 System.out.println();

http://git-wip-us.apache.org/repos/asf/cxf/blob/a83f0536/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
--
diff --git 
a/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
 
b/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
index 7f99764..ff28e4c 100644
--- 
a/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
+++ 
b/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
@@ -97,8 +97,8 @@ public final class Client {
 Transformer transformer = transformerFactory.newTransformer();
 Properties oprops = new Properties();
 oprops.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
-trans.setOutputProperties(oprops);
-trans.transform(source, sr);
+transformer.setOutputProperties(oprops);
+transformer.transform(source, sr);
 System.out.println(" Response **");
 System.out.println(bos.toString());
 bos.close();

cxf git commit: Set secure processing feature on all TransformerFactories

2016-04-06 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master 435a0c7da -> 96d04323e


Set secure processing feature on all TransformerFactories


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

Branch: refs/heads/master
Commit: 96d04323ed27f81de36b5b99913abde421a86bf2
Parents: 435a0c7
Author: Colm O hEigeartaigh 
Authored: Wed Apr 6 12:05:54 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 6 12:05:54 2016 +0100

--
 .../org/apache/cxf/profile/FastInfosetExperiment.java   |  1 +
 .../cxf/feature/transform/AbstractXSLTInterceptor.java  | 12 ++--
 .../java/org/apache/cxf/staxutils/StaxUtilsTest.java| 11 +++
 .../demo/colocated/client/DispatchSourceClient.java |  4 +++-
 .../server/GreeterDOMSourcePayloadProvider.java |  4 +++-
 .../src/main/java/demo/hw/client/Get.java   |  4 +++-
 .../src/main/java/demo/restful/client/Client.java   |  4 +++-
 .../org/apache/cxf/jaxrs/impl/ResponseImplTest.java |  6 --
 .../apache/cxf/jaxrs/provider/SourceProviderTest.java   |  5 +++--
 .../cxf/jaxws/handler/HandlerChainInvokerTest.java  |  4 +++-
 .../org/apache/cxf/javascript/JsXMLHttpRequest.java |  6 --
 .../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java  |  9 ++---
 .../cxf/systest/handlers/HandlerInvocationTest.java |  4 ++--
 .../systest/provider/AbstractSourcePayloadProvider.java |  4 +++-
 .../systest/provider/HWSAXSourcePayloadProvider.java|  4 +++-
 .../systest/provider/HWStreamSourcePayloadProvider.java |  4 +++-
 .../apache/cxf/systest/provider/TestLogicalHandler.java |  4 +++-
 .../provider/datasource/DataSourceProviderTest.java |  8 +---
 .../java/org/apache/cxf/systest/ws/rm/SequenceTest.java |  7 ---
 .../cxf/systest/ws/security/WSSecurityClientTest.java   |  9 +
 .../jaxwsmm/MessageProviderWithAddressingPolicy.java|  5 +++--
 .../tools/common/toolspec/parser/CommandLineParser.java |  4 +++-
 22 files changed, 84 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/96d04323/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
--
diff --git 
a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
 
b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
index 23ee83e..4c35e21 100644
--- 
a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
+++ 
b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
@@ -64,6 +64,7 @@ public class FastInfosetExperiment {
 private FastInfosetExperiment() throws ParserConfigurationException {
 documentBuilder = 
DocumentBuilderFactory.newInstance().newDocumentBuilder();
 transformerFactory = TransformerFactory.newInstance();
+
transformerFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, 
true);
 fiFile = new File("fiTest.fixml");
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/96d04323/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
 
b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
index b18ffcf..4259220 100644
--- 
a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
+++ 
b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
@@ -41,7 +41,15 @@ import org.apache.cxf.staxutils.StaxUtils;
  * Creates an XMLStreamReader from the InputStream on the Message.
  */
 public abstract class AbstractXSLTInterceptor extends 
AbstractPhaseInterceptor {
-private static final TransformerFactory TRANSFORM_FACTORIY = 
TransformerFactory.newInstance();
+private static final TransformerFactory TRANSFORM_FACTORY = 
TransformerFactory.newInstance();
+
+static {
+try {
+
TRANSFORM_FACTORY.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, 
true);
+} catch (javax.xml.transform.TransformerConfigurationException ex) {
+//
+}
+}
 
 private String contextPropertyName;
 private final Templates xsltTemplate;
@@ -61,7 +69,7 @@ public abstract class AbstractXSLTInterceptor extends 
AbstractPhaseInterceptorhttp://git-wip-us.apache.org/repos/asf/cxf/blob/96d04323/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java