cxf git commit: Prototyping the code for supporting JWS in header key ids

2015-06-10 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 5e4a14b4d - a1deab44c


Prototyping the code for supporting JWS in header key ids


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

Branch: refs/heads/master
Commit: a1deab44c49a8342dc346dbe06fcc9757b9fad7a
Parents: 5e4a14b
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Jun 10 13:32:18 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Jun 10 13:32:18 2015 +0100

--
 .../security/jose/jaxrs/KeyManagementUtils.java |  3 ++
 .../cxf/rs/security/jose/jwe/JweUtils.java  | 10 --
 .../cxf/rs/security/jose/jwk/JsonWebKey.java|  4 +--
 .../cxf/rs/security/jose/jwk/JsonWebKeys.java   |  2 +-
 .../cxf/rs/security/jose/jwk/JwkUtils.java  | 36 +++-
 .../cxf/rs/security/jose/jws/JwsUtils.java  | 30 ++--
 .../jose/cookbook/JwkJoseCookBookTest.java  |  8 ++---
 .../rs/security/jose/jwk/JsonWebKeyTest.java|  8 ++---
 .../jaxrs/security/jwt/JAXRSJweJwsTest.java | 20 ++-
 9 files changed, 88 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a1deab44/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
index 9a4078e..4bbc43e 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
@@ -70,6 +70,8 @@ public final class KeyManagementUtils {
 public static final String RSSEC_DECRYPT_KEY_PSWD_PROVIDER = 
rs.security.decryption.key.password.provider;
 public static final String RSSEC_DEFAULT_ALGORITHMS = 
rs.security.default.algorithms;
 public static final String RSSEC_REPORT_KEY_PROP = 
rs.security.report.public.key;
+public static final String RSSEC_REPORT_KEY_ID_PROP = 
rs.security.report.public.key.id;
+public static final String RSSEC_ACCEPT_PUBLIC_KEY_PROP = 
rs.security.accept.public.key.properties;
 private static final Logger LOG = 
LogUtils.getL7dLogger(KeyManagementUtils.class);
 
 private KeyManagementUtils() {
@@ -272,6 +274,7 @@ public final class KeyManagementUtils {
 return null;
 }
 }
+//TODO: enhance the certificate validation code
 public static void validateCertificateChain(Properties storeProperties, 
ListX509Certificate inCerts) {
 KeyStore ks = loadPersistKeyStore(JAXRSUtils.getCurrentMessage(), 
storeProperties);
 validateCertificateChain(ks, inCerts);

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1deab44/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index fd837d8..1c2c9d6 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
@@ -59,6 +59,7 @@ public final class JweUtils {
 private static final String RSSEC_ENCRYPTION_IN_PROPS = 
rs.security.encryption.in.properties;
 private static final String RSSEC_ENCRYPTION_PROPS = 
rs.security.encryption.properties;
 private static final String RSSEC_ENCRYPTION_REPORT_KEY_PROP = 
rs.security.jwe.report.public.key;
+private static final String RSSEC_ENCRYPTION_REPORT_KEY_ID_PROP = 
rs.security.jwe.report.public.key.id;
 
 private JweUtils() {
 
@@ -265,6 +266,10 @@ public final class JweUtils {
 headers != null  MessageUtils.isTrue(
 MessageUtils.getContextualProperty(m, 
RSSEC_ENCRYPTION_REPORT_KEY_PROP, 

KeyManagementUtils.RSSEC_REPORT_KEY_PROP));
+boolean reportPublicKeyId = 
+headers != null  MessageUtils.isTrue(
+MessageUtils.getContextualProperty(m, 
RSSEC_ENCRYPTION_REPORT_KEY_ID_PROP, 
+   
KeyManagementUtils.RSSEC_REPORT_KEY_ID_PROP));
 
 KeyEncryptionProvider keyEncryptionProvider = null;
 String keyEncryptionAlgo = getKeyEncryptionAlgo(m,

cxf git commit: Switch to use atmosphere's async websocket invocation executor

2015-06-10 Thread ay 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 9db0b6856 - bf04ea01f


Switch to use atmosphere's async websocket invocation executor


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

Branch: refs/heads/3.0.x-fixes
Commit: bf04ea01f9a5168902865cc68a40d3f4f19c4af4
Parents: 9db0b68
Author: Akitoshi Yoshida a...@apache.org
Authored: Wed Jun 10 13:59:37 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Wed Jun 10 15:10:18 2015 +0200

--
 .../atmosphere/AtmosphereWebSocketHandler.java  | 57 +++-
 .../AtmosphereWebSocketJettyDestination.java| 37 +++--
 .../AtmosphereWebSocketServletDestination.java  | 41 +++---
 3 files changed, 32 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bf04ea01/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java
--
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java
index 1cf1124..1501666 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java
@@ -27,7 +27,6 @@ import java.security.Principal;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
-import java.util.concurrent.RejectedExecutionException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -101,49 +100,29 @@ public class AtmosphereWebSocketHandler implements 
WebSocketProtocol {
 
 protected ListAtmosphereRequest invokeService(final WebSocket webSocket, 
 final InputStream stream) {
 LOG.fine(invokeService(WebSocket, InputStream));
-// invoke the service asynchronously as onMessage is synchronously 
blocked (in jetty)
-// make sure the byte array passed to this method is immutable, as the 
websocket framework
-// may corrupt the byte array after this method is returned (i.e., 
before the data is returned in
-// the executor's thread.
-executeServiceTask(new Runnable() {
-@Override
-public void run() {
-HttpServletRequest request = null;
-HttpServletResponse response = null;
-try {
-WebSocketServletHolder webSocketHolder = new 
AtmosphereWebSocketServletHolder(webSocket);
-response = createServletResponse(webSocketHolder);
-request = createServletRequest(webSocketHolder, stream);
-if (destination != null) {
-String reqid = request.getHeader(requestIdKey);
-if (reqid != null) {
-response.setHeader(responseIdKey, reqid);
-}
-
((WebSocketDestinationService)destination).invokeInternal(null,
-
webSocket.resource().getRequest().getServletContext(),
-request, response);
-}
-} catch (InvalidPathException ex) {
-reportErrorStatus(response, 400);
-} catch (Exception e) {
-LOG.log(Level.WARNING, Failed to invoke service, e);
+HttpServletRequest request = null;
+HttpServletResponse response = null;
+try {
+WebSocketServletHolder webSocketHolder = new 
AtmosphereWebSocketServletHolder(webSocket);
+response = createServletResponse(webSocketHolder);
+request = createServletRequest(webSocketHolder, stream);
+if (destination != null) {
+String reqid = request.getHeader(requestIdKey);
+if (reqid != null) {
+response.setHeader(responseIdKey, reqid);
 }
+((WebSocketDestinationService)destination).invokeInternal(null,
+webSocket.resource().getRequest().getServletContext(),
+request, response);
 }
-});
+} catch (InvalidPathException ex) {
+reportErrorStatus(response, 400);
+} catch (Exception e) {
+LOG.log(Level.WARNING, Failed to invoke service, e);
+}
 return null;
 }
 
-private void

cxf git commit: Switch to use atmosphere's async websocket invocation executor

2015-06-10 Thread ay 
Repository: cxf
Updated Branches:
  refs/heads/master 7f7cc3c39 - 5e4a14b4d


Switch to use atmosphere's async websocket invocation executor


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

Branch: refs/heads/master
Commit: 5e4a14b4da1f1b27e4df811be80a7f11fc6dae8d
Parents: 7f7cc3c
Author: Akitoshi Yoshida a...@apache.org
Authored: Wed Jun 10 13:59:37 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Wed Jun 10 13:59:37 2015 +0200

--
 .../AtmosphereWebSocketJettyDestination.java| 37 --
 .../AtmosphereWebSocketServletDestination.java  | 41 
 2 files changed, 14 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5e4a14b4/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
--
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
index ec873cc..2abef6c 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
@@ -21,8 +21,6 @@ package org.apache.cxf.transport.websocket.atmosphere;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -41,7 +39,6 @@ import 
org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
 import org.apache.cxf.transport.http_jetty.JettyHTTPHandler;
 import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
 import org.apache.cxf.transport.websocket.WebSocketDestinationService;
-import org.apache.cxf.workqueue.WorkQueueManager;
 import org.atmosphere.cpr.ApplicationConfig;
 import org.atmosphere.cpr.AtmosphereFramework;
 import org.atmosphere.cpr.AtmosphereRequest;
@@ -59,7 +56,6 @@ public class AtmosphereWebSocketJettyDestination extends 
JettyHTTPDestination im
 WebSocketDestinationService {
 private static final Logger LOG = 
LogUtils.getL7dLogger(AtmosphereWebSocketJettyDestination.class);
 private AtmosphereFramework framework;
-private Executor executor;
 
 public AtmosphereWebSocketJettyDestination(Bus bus, DestinationRegistry 
registry, EndpointInfo ei,
  JettyHTTPServerEngineFactory 
serverEngineFactory) throws IOException {
@@ -69,13 +65,10 @@ public class AtmosphereWebSocketJettyDestination extends 
JettyHTTPDestination im
 
framework.addInitParameter(ApplicationConfig.PROPERTY_NATIVE_COMETSUPPORT, 
true);
 framework.addInitParameter(ApplicationConfig.PROPERTY_SESSION_SUPPORT, 
true);
 framework.addInitParameter(ApplicationConfig.WEBSOCKET_SUPPORT, 
true);
+
framework.addInitParameter(ApplicationConfig.WEBSOCKET_PROTOCOL_EXECUTION, 
true);
 AtmosphereUtils.addInterceptors(framework, bus);
 framework.addAtmosphereHandler(/, new DestinationHandler());
 framework.init();
-
-// the executor for decoupling the service invocation from websocket's 
onMessage call which is
-// synchronously blocked
-executor = 
bus.getExtension(WorkQueueManager.class).getAutomaticWorkQueue();
 }
 
 @Override
@@ -146,31 +139,15 @@ public class AtmosphereWebSocketJettyDestination extends 
JettyHTTPDestination im
 @Override
 public void onRequest(final AtmosphereResource resource) throws 
IOException {
 LOG.fine(onRequest);
-executeHandlerTask(new Runnable() {
-@Override
-public void run() {
-try {
-invokeInternal(null, 
-resource.getRequest().getServletContext(), 
resource.getRequest(), resource.getResponse());
-} catch (Exception e) {
-LOG.log(Level.WARNING, Failed to invoke service, e);
-}
-}
-});
+try {
+invokeInternal(null, 
+resource.getRequest().getServletContext(), 
resource.getRequest(), resource.getResponse());
+} catch (Exception e) {
+LOG.log(Level.WARNING, Failed to invoke

cxf git commit: Prototyping the code for supporting JWS in header key ids

2015-06-10 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e17409d6b - 9db0b6856


Prototyping the code for supporting JWS in header key ids


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

Branch: refs/heads/3.0.x-fixes
Commit: 9db0b685641ffb18c4718d35d15f7a307a332e07
Parents: e17409d
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Jun 10 13:32:18 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Jun 10 13:33:43 2015 +0100

--
 .../security/jose/jaxrs/KeyManagementUtils.java |  3 ++
 .../cxf/rs/security/jose/jwe/JweUtils.java  | 10 --
 .../cxf/rs/security/jose/jwk/JsonWebKey.java|  4 +--
 .../cxf/rs/security/jose/jwk/JsonWebKeys.java   |  2 +-
 .../cxf/rs/security/jose/jwk/JwkUtils.java  | 36 +++-
 .../cxf/rs/security/jose/jws/JwsUtils.java  | 30 ++--
 .../jose/cookbook/JwkJoseCookBookTest.java  |  8 ++---
 .../rs/security/jose/jwk/JsonWebKeyTest.java|  8 ++---
 .../jaxrs/security/jwt/JAXRSJweJwsTest.java | 20 ++-
 9 files changed, 88 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9db0b685/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
index 9a4078e..4bbc43e 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
@@ -70,6 +70,8 @@ public final class KeyManagementUtils {
 public static final String RSSEC_DECRYPT_KEY_PSWD_PROVIDER = 
rs.security.decryption.key.password.provider;
 public static final String RSSEC_DEFAULT_ALGORITHMS = 
rs.security.default.algorithms;
 public static final String RSSEC_REPORT_KEY_PROP = 
rs.security.report.public.key;
+public static final String RSSEC_REPORT_KEY_ID_PROP = 
rs.security.report.public.key.id;
+public static final String RSSEC_ACCEPT_PUBLIC_KEY_PROP = 
rs.security.accept.public.key.properties;
 private static final Logger LOG = 
LogUtils.getL7dLogger(KeyManagementUtils.class);
 
 private KeyManagementUtils() {
@@ -272,6 +274,7 @@ public final class KeyManagementUtils {
 return null;
 }
 }
+//TODO: enhance the certificate validation code
 public static void validateCertificateChain(Properties storeProperties, 
ListX509Certificate inCerts) {
 KeyStore ks = loadPersistKeyStore(JAXRSUtils.getCurrentMessage(), 
storeProperties);
 validateCertificateChain(ks, inCerts);

http://git-wip-us.apache.org/repos/asf/cxf/blob/9db0b685/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index fd837d8..1c2c9d6 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
@@ -59,6 +59,7 @@ public final class JweUtils {
 private static final String RSSEC_ENCRYPTION_IN_PROPS = 
rs.security.encryption.in.properties;
 private static final String RSSEC_ENCRYPTION_PROPS = 
rs.security.encryption.properties;
 private static final String RSSEC_ENCRYPTION_REPORT_KEY_PROP = 
rs.security.jwe.report.public.key;
+private static final String RSSEC_ENCRYPTION_REPORT_KEY_ID_PROP = 
rs.security.jwe.report.public.key.id;
 
 private JweUtils() {
 
@@ -265,6 +266,10 @@ public final class JweUtils {
 headers != null  MessageUtils.isTrue(
 MessageUtils.getContextualProperty(m, 
RSSEC_ENCRYPTION_REPORT_KEY_PROP, 

KeyManagementUtils.RSSEC_REPORT_KEY_PROP));
+boolean reportPublicKeyId = 
+headers != null  MessageUtils.isTrue(
+MessageUtils.getContextualProperty(m, 
RSSEC_ENCRYPTION_REPORT_KEY_ID_PROP, 
+   
KeyManagementUtils.RSSEC_REPORT_KEY_ID_PROP));
 
 KeyEncryptionProvider keyEncryptionProvider = null;
 String keyEncryptionAlgo =

buildbot failure in ASF Buildbot on cxf-site-production

2015-06-10 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/9858

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

buildbot success in ASF Buildbot on cxf-site-production

2015-06-10 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/9859

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

svn commit: r954388 - in /websites/production/cxf/content: cache/docs.pageCache docs/maven-java2ws-plugin.html

2015-06-10 Thread buildbot 
Author: buildbot
Date: Wed Jun 10 14:47:06 2015
New Revision: 954388

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/maven-java2ws-plugin.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/maven-java2ws-plugin.html
==
--- websites/production/cxf/content/docs/maven-java2ws-plugin.html (original)
+++ websites/production/cxf/content/docs/maven-java2ws-plugin.html Wed Jun 10 
14:47:06 2015
@@ -117,11 +117,8 @@ Apache CXF -- Maven Java2WS plugin
  td height=100%
!-- Content --
div class=wiki-content
-div id=ConfluenceContentpThis plugin can generate WSDL, server side code 
used to start web service and client side code from a java class.br 
clear=none
-Here is a simple example:/p
-div class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
-script class=theme: Default; brush: xml; gutter: false 
type=syntaxhighlighter![CDATA[
-lt;plugingt;
+div id=ConfluenceContentpThis plugin can generate WSDL, server side code 
used to start web service and client side code from a java class.br 
clear=none Here is a simple example:/pdiv class=code panel pdl 
style=border-width: 1px;div class=codeContent panelContent pdl
+script class=theme: Default; brush: xml; gutter: false 
type=syntaxhighlighter![CDATA[lt;plugingt;
lt;groupIdgt;org.apache.cxflt;/groupIdgt;
lt;artifactIdgt;cxf-java2ws-pluginlt;/artifactIdgt;
lt;versiongt;${cxf.version}lt;/versiongt;
@@ -154,11 +151,8 @@ Here is a simple example:/p
lt;/executionsgt;
 lt;/plugingt;
 ]]/script
-/div/div
-pHere are the options you can use and their defaults:/p
-div class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
-script class=theme: Default; brush: java; gutter: false 
type=syntaxhighlighter![CDATA[
-lt;configurationgt;
+/div/divpHere are the options you can use and their defaults:/pdiv 
class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
+script class=theme: Default; brush: java; gutter: false 
type=syntaxhighlighter![CDATA[lt;configurationgt;
lt;classNamegt;...lt;/classNamegt;
lt;classpathgt;...lt;/classpathgt;
lt;outputFilegt;...lt;/outputFilegt;
@@ -173,17 +167,12 @@ Here is a simple example:/p
lt;targetNameSpacegt;...lt;/targetNameSpacegt;
lt;verbosegt;falselt;/verbosegt;
lt;quietgt;falselt;/quietgt;
-   lt;attachWsdlgt;falselt;/attachWsdlgt;
+   lt;attachWsdlgt;truelt;/attachWsdlgt;
lt;addressgt;...lt;/addressgt;
 lt;/configurationgt;
 ]]/script
-/div/div
-pFor detailed descriptions of the configuration elements see a shape=rect 
href=java-to-ws.htmlJava to WS/a page./p
-
-pThe outputFile value by default will be:/p
-div class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
-script class=theme: Default; brush: java; gutter: false 
type=syntaxhighlighter![CDATA[
-${project.build.directory}/generated/wsdl/${className}.wsdl
+/div/divpFor detailed descriptions of the configuration elements see a 
shape=rect href=java-to-ws.htmlJava to WS/a page./ppThe outputFile 
value by default will be:/pdiv class=code panel pdl style=border-width: 
1px;div class=codeContent panelContent pdl
+script class=theme: Default; brush: java; gutter: false 
type=syntaxhighlighter![CDATA[${project.build.directory}/generated/wsdl/${className}.wsdl
 ]]/script
 /div/div/div
/div

[2/2] cxf git commit: Introducing few more JWK related enums

2015-06-10 Thread sergeyb 
Introducing few more JWK related enums


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

Branch: refs/heads/3.0.x-fixes
Commit: 106ffec44da536f4d505c912bff86ae137ce2ca8
Parents: bf04ea0
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Jun 10 17:37:14 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Jun 10 17:39:33 2015 +0100

--
 .../json/JsonMapObjectReaderWriter.java |  5 ++-
 .../cxf/rs/security/jose/JoseHeaders.java   |  3 +-
 .../security/jose/jaxrs/KeyManagementUtils.java | 29 +++--
 .../rs/security/jose/jwa/ContentAlgorithm.java  |  3 ++
 .../cxf/rs/security/jose/jwa/KeyAlgorithm.java  |  3 ++
 .../security/jose/jwa/SignatureAlgorithm.java   |  3 ++
 .../cxf/rs/security/jose/jwe/JweHeaders.java|  9 ++--
 .../cxf/rs/security/jose/jwe/JweUtils.java  | 29 -
 .../cxf/rs/security/jose/jwk/JsonWebKey.java| 45 ++--
 .../cxf/rs/security/jose/jwk/JsonWebKeys.java   | 27 +---
 .../cxf/rs/security/jose/jwk/JwkUtils.java  | 23 +-
 .../cxf/rs/security/jose/jws/JwsHeaders.java| 15 +++
 .../cxf/rs/security/jose/jws/JwsUtils.java  | 33 +++---
 .../jose/cookbook/JwkJoseCookBookTest.java  | 18 
 .../rs/security/jose/jwk/JsonWebKeyTest.java| 10 ++---
 .../jose/jws/JwsCompactReaderWriterTest.java| 17 +---
 16 files changed, 165 insertions(+), 107 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/106ffec4/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
--
diff --git 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
index ca8741f..71fae6c 100644
--- 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
+++ 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
@@ -102,11 +102,12 @@ public class JsonMapObjectReaderWriter {
 } else if (Map.class.isAssignableFrom(value.getClass())) {
 toJsonInternal(out, (MapString, Object)value);
 } else {
-if (value.getClass() == String.class) {
+boolean stringOrEnum = value.getClass() == String.class || 
value.getClass().isEnum();
+if (stringOrEnum) {
 out.append(\);
 }
 out.append(value.toString());
-if (value.getClass() == String.class) {
+if (stringOrEnum) {
 out.append(\);
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/106ffec4/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
index a73e7b0..9f787b5 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
@@ -59,7 +59,8 @@ public class JoseHeaders extends JsonMapObject {
 }
 
 public String getAlgorithm() {
-return (String)getHeader(JoseConstants.HEADER_ALGORITHM);
+Object prop = getHeader(JoseConstants.HEADER_ALGORITHM);
+return prop == null ? null : prop.toString();
 }
 
 public void setKeyId(String kid) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/106ffec4/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
index 4bbc43e..1a8b1e8 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
@@ -49,7 +49,7 @@ import org.apache.cxf.jaxrs.utils.ResourceUtils;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.rs.security.jose.JoseException;
-import

[1/2] cxf git commit: Adding missing jwk enums

2015-06-10 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes bf04ea01f - ce3b4bb1a


Adding missing jwk enums


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

Branch: refs/heads/3.0.x-fixes
Commit: ce3b4bb1a3a7a1e4e2aa0197fc58a42aee796503
Parents: 106ffec
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Jun 10 17:38:26 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Jun 10 17:39:33 2015 +0100

--
 .../cxf/rs/security/jose/jwk/KeyOperation.java  | 46 
 .../cxf/rs/security/jose/jwk/KeyType.java   | 44 +++
 .../cxf/rs/security/jose/jwk/PublicKeyUse.java  | 46 
 3 files changed, 136 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ce3b4bb1/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyOperation.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyOperation.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyOperation.java
new file mode 100644
index 000..c258543
--- /dev/null
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyOperation.java
@@ -0,0 +1,46 @@
+/**
+ * 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.rs.security.jose.jwk;
+
+
+public enum KeyOperation {
+SIGN(JsonWebKey.KEY_OPER_SIGN),
+VERIFY(JsonWebKey.KEY_OPER_VERIFY),
+ENCRYPT(JsonWebKey.KEY_OPER_ENCRYPT),
+DECRYPT(JsonWebKey.KEY_OPER_DECRYPT),
+WRAPKEY(JsonWebKey.KEY_OPER_WRAP_KEY),
+UNWRAPKEY(JsonWebKey.KEY_OPER_UNWRAP_KEY),
+DERIVEKEY(JsonWebKey.KEY_OPER_DERIVE_KEY),
+DERIVEBITS(JsonWebKey.KEY_OPER_DERIVE_BITS);
+
+private final String oper;
+private KeyOperation(String oper) {
+this.oper = oper;
+}
+public static KeyOperation getKeyOperation(String oper) {
+if (oper == null) {
+return null;
+}
+return valueOf(oper.toUpperCase());
+}
+public String toString() {
+return oper;
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce3b4bb1/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyType.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyType.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyType.java
new file mode 100644
index 000..b10afb8
--- /dev/null
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyType.java
@@ -0,0 +1,44 @@
+/**
+ * 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.rs.security.jose.jwk;
+
+
+public enum KeyType {
+RSA(JsonWebKey.KEY_TYPE_RSA),
+EC(JsonWebKey.KEY_TYPE_ELLIPTIC),
+OCTET(JsonWebKey.KEY_TYPE_OCTET);
+
+private final String type;
+private KeyType(String type) {
+this.type = type;
+}
+public static KeyType getKeyType(String type) {
+if (type == null) {
+

cxf-fediz git commit: [FEDIZ-123] - First cut at updating certs.

2015-06-10 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 5f1bc25ed - c20e4856d


[FEDIZ-123] - First cut at updating certs.


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

Branch: refs/heads/master
Commit: c20e4856d2d6788ce80caad25b88e7ff7d2be2de
Parents: 5f1bc25
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Jun 10 17:23:56 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Jun 10 17:23:56 2015 +0100

--
 .../samplekeys/HowToGenerateKeysREADME.html |  19 ++-
 examples/samplekeys/idp-ssl-key.jks | Bin 0 - 2074 bytes
 examples/samplekeys/idp-ssl-server.jks  | Bin 1123 - 0 bytes
 examples/samplekeys/idp-ssl-trust.jks   | Bin 0 - 783 bytes
 examples/samplekeys/rp-ssl-key.jks  | Bin 0 - 2070 bytes
 examples/samplekeys/rp-ssl-server.jks   | Bin 1124 - 0 bytes
 examples/samplekeys/wsp-ssl-key.jks | Bin 0 - 2073 bytes
 examples/samplekeys/wsp-ssl-server.jks  | Bin 1123 - 0 bytes
 .../webapp/src/main/resources/rp-ssl-key.jks| Bin 1124 - 2070 bytes
 .../src/main/resources/webappKeystore.jks   | Bin 1400 - 1534 bytes
 services/idp/pom.xml|   2 +-
 services/idp/src/main/resources/idp-ssl-key.jks | Bin 1123 - 2074 bytes
 .../idp/src/main/resources/idp-ssl-trust.jks| Bin 716 - 783 bytes
 services/idp/src/main/resources/stsrealm_a.jks  | Bin 2060 - 2061 bytes
 services/idp/src/main/resources/stsrealm_b.jks  | Bin 2061 - 2062 bytes
 services/idp/src/test/resources/rest-client.xml |   2 +-
 services/idp/src/test/resources/stsrealm_a.jks  | Bin 2060 - 2061 bytes
 services/pom.xml|   2 +-
 services/sts/src/main/resources/realma.cert | Bin 709 - 1015 bytes
 services/sts/src/main/resources/realmb.cert | Bin 709 - 1015 bytes
 services/sts/src/main/resources/stsrealm_a.jks  | Bin 2060 - 2061 bytes
 services/sts/src/main/resources/stsrealm_b.jks  | Bin 2061 - 2062 bytes
 services/sts/src/main/resources/ststrust.jks| Bin 4079 - 3161 bytes
 systests/tomcat7/src/test/resources/alice.cer   | Bin 808 - 873 bytes
 .../tomcat7/src/test/resources/alice_client.jks | Bin 1277 - 2225 bytes
 systests/tomcat7/src/test/resources/client.jks  | Bin 2060 - 2061 bytes
 .../tomcat7/src/test/resources/clienttrust.jks  | Bin 1526 - 1512 bytes
 systests/tomcat7/src/test/resources/server.jks  | Bin 2701 - 3717 bytes
 28 files changed, 13 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c20e4856/examples/samplekeys/HowToGenerateKeysREADME.html
--
diff --git a/examples/samplekeys/HowToGenerateKeysREADME.html 
b/examples/samplekeys/HowToGenerateKeysREADME.html
index 5b020c9..1f8e695 100644
--- a/examples/samplekeys/HowToGenerateKeysREADME.html
+++ b/examples/samplekeys/HowToGenerateKeysREADME.html
@@ -11,29 +11,30 @@ is recommended./p
 tr bgcolor=#FF
 thKeystore (Password)/ththKey Alias 
(Password)/ththLocation/ththCreation Script Used/ththNeeds to 
trust/ththIs trusted by/th/tr
 trtd colspan=6strongemServlet Container Keystores:  The keys can be 
simply placed in the root folder of each Servlet Container installation.  They 
are used to configure SSL for the Servlet Container instances as described here 
for Tomcat: a 
href=http://cxf.apache.org/fediz-tomcat.html;http://cxf.apache.org/fediz-tomcat.html/a.
  For Tomcat keys only, the keystore password and the private key password 
needs to be the same./em/strong/tr
-trtdidp-ssl-server.jks (tompass)/tdtdmytomidpkey 
(tompass)/tdtdbase folder of Tomcat instance holding the IDP and IDP 
STS/td
-tdcodekeytool -genkeypair -validity 730 -alias mytomidpkey -keystore 
idp-ssl-server.jks -dname cn=localhost -keypass tompass -storepass 
tompass/codebr/br/codekeytool -keystore idp-ssl-server.jks -storepass 
tompass -export -alias mytomidpkey -file MyTCIDP.cer/code/td
+trtdidp-ssl-key.jks (tompass)/tdtdmytomidpkey (tompass)/tdtdbase 
folder of Tomcat instance holding the IDP and IDP STS/td
+tdcodekeytool -genkeypair -validity 730 -alias mytomidpkey -keystore 
idp-ssl-server.jks -dname cn=localhost -keypass tompass -storepass tompass 
-keysize 2048 -keyalg RSA/codebr/br/codekeytool -keystore 
idp-ssl-server.jks -storepass tompass -export -alias mytomidpkey -file 
MyTCIDP.cer/code/td
 tdNobody/tdtdFediz IDP modulebr/br/wsclientWebapp's webapp 
modulebr/br/Browser/td/tr 
-trtdrp-ssl-server.jks (tompass)/tdtdmytomrpkey (tompass)/tdtdbase 
folder of Tomcat instance holding the relying party applications for both 
samples

cxf git commit: Introducing few more JWK related enums

2015-06-10 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master a1deab44c - 3d6dfd05d


Introducing few more JWK related enums


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

Branch: refs/heads/master
Commit: 3d6dfd05d616165d1b8243f3b873eaddc51fe581
Parents: a1deab4
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Jun 10 17:37:14 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Jun 10 17:37:14 2015 +0100

--
 .../json/JsonMapObjectReaderWriter.java |  5 ++-
 .../cxf/rs/security/jose/JoseHeaders.java   |  3 +-
 .../security/jose/jaxrs/KeyManagementUtils.java | 29 +++--
 .../rs/security/jose/jwa/ContentAlgorithm.java  |  3 ++
 .../cxf/rs/security/jose/jwa/KeyAlgorithm.java  |  3 ++
 .../security/jose/jwa/SignatureAlgorithm.java   |  3 ++
 .../cxf/rs/security/jose/jwe/JweHeaders.java|  9 ++--
 .../cxf/rs/security/jose/jwe/JweUtils.java  | 29 -
 .../cxf/rs/security/jose/jwk/JsonWebKey.java| 45 ++--
 .../cxf/rs/security/jose/jwk/JsonWebKeys.java   | 27 +---
 .../cxf/rs/security/jose/jwk/JwkUtils.java  | 23 +-
 .../cxf/rs/security/jose/jws/JwsHeaders.java| 15 +++
 .../cxf/rs/security/jose/jws/JwsUtils.java  | 33 +++---
 .../jose/cookbook/JwkJoseCookBookTest.java  | 18 
 .../rs/security/jose/jwk/JsonWebKeyTest.java| 10 ++---
 .../jose/jws/JwsCompactReaderWriterTest.java| 17 +---
 16 files changed, 165 insertions(+), 107 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3d6dfd05/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
--
diff --git 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
index ca8741f..71fae6c 100644
--- 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
+++ 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
@@ -102,11 +102,12 @@ public class JsonMapObjectReaderWriter {
 } else if (Map.class.isAssignableFrom(value.getClass())) {
 toJsonInternal(out, (MapString, Object)value);
 } else {
-if (value.getClass() == String.class) {
+boolean stringOrEnum = value.getClass() == String.class || 
value.getClass().isEnum();
+if (stringOrEnum) {
 out.append(\);
 }
 out.append(value.toString());
-if (value.getClass() == String.class) {
+if (stringOrEnum) {
 out.append(\);
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/3d6dfd05/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
index a73e7b0..9f787b5 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
@@ -59,7 +59,8 @@ public class JoseHeaders extends JsonMapObject {
 }
 
 public String getAlgorithm() {
-return (String)getHeader(JoseConstants.HEADER_ALGORITHM);
+Object prop = getHeader(JoseConstants.HEADER_ALGORITHM);
+return prop == null ? null : prop.toString();
 }
 
 public void setKeyId(String kid) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/3d6dfd05/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
index 4bbc43e..1a8b1e8 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
@@ -49,7 +49,7 @@ import org.apache.cxf.jaxrs.utils.ResourceUtils;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import

cxf git commit: Adding missing jwk enums

2015-06-10 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 3d6dfd05d - ab80eeff6


Adding missing jwk enums


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

Branch: refs/heads/master
Commit: ab80eeff61d6c97b4f8914a326b007dcda89a104
Parents: 3d6dfd0
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Jun 10 17:38:26 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Jun 10 17:38:26 2015 +0100

--
 .../cxf/rs/security/jose/jwk/KeyOperation.java  | 46 
 .../cxf/rs/security/jose/jwk/KeyType.java   | 44 +++
 .../cxf/rs/security/jose/jwk/PublicKeyUse.java  | 46 
 3 files changed, 136 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ab80eeff/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyOperation.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyOperation.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyOperation.java
new file mode 100644
index 000..c258543
--- /dev/null
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyOperation.java
@@ -0,0 +1,46 @@
+/**
+ * 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.rs.security.jose.jwk;
+
+
+public enum KeyOperation {
+SIGN(JsonWebKey.KEY_OPER_SIGN),
+VERIFY(JsonWebKey.KEY_OPER_VERIFY),
+ENCRYPT(JsonWebKey.KEY_OPER_ENCRYPT),
+DECRYPT(JsonWebKey.KEY_OPER_DECRYPT),
+WRAPKEY(JsonWebKey.KEY_OPER_WRAP_KEY),
+UNWRAPKEY(JsonWebKey.KEY_OPER_UNWRAP_KEY),
+DERIVEKEY(JsonWebKey.KEY_OPER_DERIVE_KEY),
+DERIVEBITS(JsonWebKey.KEY_OPER_DERIVE_BITS);
+
+private final String oper;
+private KeyOperation(String oper) {
+this.oper = oper;
+}
+public static KeyOperation getKeyOperation(String oper) {
+if (oper == null) {
+return null;
+}
+return valueOf(oper.toUpperCase());
+}
+public String toString() {
+return oper;
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ab80eeff/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyType.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyType.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyType.java
new file mode 100644
index 000..b10afb8
--- /dev/null
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/KeyType.java
@@ -0,0 +1,44 @@
+/**
+ * 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.rs.security.jose.jwk;
+
+
+public enum KeyType {
+RSA(JsonWebKey.KEY_TYPE_RSA),
+EC(JsonWebKey.KEY_TYPE_ELLIPTIC),
+OCTET(JsonWebKey.KEY_TYPE_OCTET);
+
+private final String type;
+private KeyType(String type) {
+this.type = type;
+}
+public static KeyType getKeyType(String type) {
+if (type == null) {
+

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

2015-06-10 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes ce3b4bb1a - 0f45b4dce


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

Branch: refs/heads/3.0.x-fixes
Commit: 0f45b4dce39e9674876c3ea1a6fae65f24fd47e1
Parents: 1a3050b
Author: Daniel Kulp dk...@apache.org
Authored: Wed Jun 10 13:04:37 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Jun 10 13:04:37 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/0f45b4dc/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5c479b2..38f1292 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,6 +2,7 @@ origin/master
 
 B 004321a2e955665005b9c5bfe304feaf9cb622b0
 B 005ee936d42897f7083fd9fe26addec4779d4764
+B 013eb89d0453bf897d219b762e50ab5232f6ca00
 B 015419bf394e219cbb07ca7706b4bd8e2942e856
 B 035154fb466fb9c833804d1bc747804df9e9992b
 B 03bd1b4f0beaddf4df112f7c08d5749862805dfa
@@ -12,6 +13,7 @@ B 07c6322a52c12077567a48c9a87e832ea9362886
 B 08d98fbb13440de2da3b19915d8dfe21531cb284
 B 0aaa2b5742a53bf31704939e4bc21906100bbc54
 B 0ab9416fda31298e485f2a6864c263447e4b32de
+B 0ac5dde071c9c2731fca757a2108f5dd698f8af5
 B 0ba19453f17be19aa2e46848b1908f776a6abb64
 B 0c0555f4ac850ec8e38302d73207170affe4376a
 B 0d0bc938103b0ea9311c3b73f6c385aa3e12260c
@@ -81,6 +83,7 @@ B 3a080015474d27075b0b03aa9ec74ab443504ebd
 B 3aec3e286e4732918589c239ea1b8f7e1d3a9836
 B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
 B 3c2092b369f06d4f71134397240092a659bcbca1
+B 3cf195384c2175085c7840dc4469837a347c7d0a
 B 3d747fa0847db2798f6662a2540d4f3a79d83edd
 B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97
 B 42b3ae5ec3ae398082e892d6c37acb0809876894
@@ -137,6 +140,7 @@ B 5faf182264c64bd3c0abc0addc9746b64492c864
 B 5fbd407bac5af5e55bb280125405d75b7add872b
 B 5fc6229a6d289a6a4f23fac4f1d7750285c85d1a
 B 6168d90fab71f2a8811640bfbbf88bfd1eed1848
+B 61c9bef8e5115403a44eeddab6755174f44bd92b
 B 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae
 B 6359c930bb27b0ea589c7c2d7ed552babe4897ed
 B 6400b3cd1d87e52723fac2641b34a5f0289b908c
@@ -187,6 +191,7 @@ B 7e8d0b4b1cd868272380ca5779e67a15e46cf799
 B 7e95279dd1170f5878687d7eea27f7d7f03a434b
 B 80014cf0e6fb1ba62ffdb3766acffd2130eef9d6
 B 80d7128a3ba1944a603c73e5e908d86c9bf27648
+B 842fade62621490a407729fa1357f043216f25e6
 B 857b55796dc7fc2b302e26d99f84df1712ff9c58
 B 85c06fc4d6a642627434785a2d228d3c08d68768
 B 85d6e1a63c95088917853436fe1adcce4863ce6c
@@ -230,6 +235,7 @@ B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415
 B 9fce658c4611f790983a3d5cef7312eec8771461
 B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9
 B a04a1e06f7fffc5f145e33c6832f31b04782516b
+B a1487f2cd460028608a693ee6136d62803a633c6
 B a16abff276542979aef91f7e56cd8e67a695db14
 B a2855695896d5084ea288b0fa47457e4b7bfac38
 B a293c4db64e0136011afea865eac646f4129ce60
@@ -273,6 +279,7 @@ B bc752dc5bd89b5d70d00435fc1185e72659d7e4d
 B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
 B bd94b4c8778e360d538d5acb3f6a3710af92e6f1
 B bdd359af4de505f7bbe50bf9990da5788e12fd71
+B be4e40a46784d81c559b073b487255cf87334a77
 B bea22d764138e365513856c23be760a7719530a0
 B bef3d8408feb07365e17ca6960db7b4b2f1436ec
 B bf3d1faa9ea33419f0e1bac90cecc7bba112dd5c
@@ -288,6 +295,7 @@ B cb19d05174a3bd078b391c4f6c151ee6e34e2956
 B cc9222b453b92f1115d5fc5df2cc11ccb3600940
 B cd7095c49ab2be4a5667450bf67e5e4be8ec84c1
 B cd809b8526fc5620c481d4ee5a8534ccf6babae4
+B cdafd372c60b7e19229d7e6a91fc69b9c5dbc69c
 B d021b9041e00518099947274455b2027326a3c7c
 B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c
 B d1c7f1f6be4ce14bd0e99ec9672d9c1957515f35
@@ -352,6 +360,7 @@ B f94861bd6745e92bc1f69acaa907761f3bcc0613
 B f97778f0c21a4dc0f083e840e8157fe2f8528d90
 B f97ef83725ba3f54083efe99a7dd97bab6e44dec
 B fa37d8722d154bbdec9d2acf4da16a04db0a34f1
+B fa940162050202259c3ac7185d7fc2d7e65826d4
 B fb94440f6f1d5c7c572b6c0163f275c95073b8ee
 B fb9d26581c364c62c7343847ebe4136b8c97700f
 B fc78cd31869a4e580c4d2a9e7864ae6dae8c311b

cxf git commit: Specify version for tycho-packaging-plugin

2015-06-10 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/master ab80eeff6 - ca829e305


Specify version for tycho-packaging-plugin


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

Branch: refs/heads/master
Commit: ca829e305829526779b9cb474d85c3eb1caed2b6
Parents: ab80eef
Author: Daniel Kulp dk...@apache.org
Authored: Wed Jun 10 13:03:42 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Jun 10 13:03:42 2015 -0400

--
 services/xkms/xkms-x509-handlers/pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ca829e30/services/xkms/xkms-x509-handlers/pom.xml
--
diff --git a/services/xkms/xkms-x509-handlers/pom.xml 
b/services/xkms/xkms-x509-handlers/pom.xml
index 3571235..7c0c093 100644
--- a/services/xkms/xkms-x509-handlers/pom.xml
+++ b/services/xkms/xkms-x509-handlers/pom.xml
@@ -72,6 +72,7 @@
 plugin
 groupIdorg.eclipse.tycho/groupId
 artifactIdtycho-packaging-plugin/artifactId
+version0.22.0/version
 executions
 execution
 idtimestamp/id

[2/2] cxf git commit: Specify version for tycho-packaging-plugin

2015-06-10 Thread dkulp 
Specify version for tycho-packaging-plugin


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

Branch: refs/heads/3.0.x-fixes
Commit: 1a3050b0a171f9f67731c0b9070ebe004da3ae75
Parents: ce3b4bb
Author: Daniel Kulp dk...@apache.org
Authored: Wed Jun 10 13:03:42 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Jun 10 13:04:37 2015 -0400

--
 services/xkms/xkms-x509-handlers/pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1a3050b0/services/xkms/xkms-x509-handlers/pom.xml
--
diff --git a/services/xkms/xkms-x509-handlers/pom.xml 
b/services/xkms/xkms-x509-handlers/pom.xml
index 3a0a229..fb893aa 100644
--- a/services/xkms/xkms-x509-handlers/pom.xml
+++ b/services/xkms/xkms-x509-handlers/pom.xml
@@ -72,6 +72,7 @@
 plugin
 groupIdorg.eclipse.tycho/groupId
 artifactIdtycho-packaging-plugin/artifactId
+version0.22.0/version
 executions
 execution
 idtimestamp/id

buildbot failure in ASF Buildbot on cxf-site-production

2015-06-10 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/9871

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

buildbot success in ASF Buildbot on cxf-site-production

2015-06-10 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/9872

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot