svn commit: r1018768 - in /websites/production/cxf/content: cache/docs.pageCache docs/using-opentracing.html

2017-09-26 Thread buildbot 
Author: buildbot
Date: Wed Sep 27 02:03:11 2017
New Revision: 1018768

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/using-opentracing.html

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

Modified: websites/production/cxf/content/docs/using-opentracing.html
==
--- websites/production/cxf/content/docs/using-opentracing.html (original)
+++ websites/production/cxf/content/docs/using-opentracing.html Wed Sep 27 
02:03:11 2017
@@ -33,6 +33,7 @@
 
 
 
+

[cxf] branch master updated: CXF-7439: Support OpenTracing Tracer API. Minor cleanups

2017-09-26 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
 new 214391a  CXF-7439: Support OpenTracing Tracer API. Minor cleanups
214391a is described below

commit 214391a2d850dcd96bc1b4e5d41a8ca48e8c5aa2
Author: reta 
AuthorDate: Tue Sep 26 21:45:08 2017 -0400

CXF-7439: Support OpenTracing Tracer API. Minor cleanups
---
 .../src/main/resources/OSGI-INF/blueprint/context.xml  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
index 264d86c..371350f 100644
--- 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
@@ -64,13 +64,12 @@
 
 
 
-http://localhost:14268/api/traces; 
type="java.lang.String" />
+http://localhost:14268/api/traces; />
 
 
 
 
 
-  
 
 
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" '].

[cxf] branch master updated: CXF-7439: Support OpenTracing Tracer API. Adding Karaf feature and OSGi sample.

2017-09-26 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
 new 35eaece  CXF-7439: Support OpenTracing Tracer API. Adding Karaf 
feature and OSGi sample.
35eaece is described below

commit 35eaececdf71dc6a2581c0ada943350e9da35e58
Author: reta 
AuthorDate: Tue Sep 26 19:31:21 2017 -0400

CXF-7439: Support OpenTracing Tracer API. Adding Karaf feature and OSGi 
sample.
---
 .../samples/jax_rs/tracing_opentracing/README.txt  |   2 +-
 .../jax_rs/tracing_opentracing_osgi/README.txt |  98 +++
 .../jax_rs/tracing_opentracing_osgi/pom.xml| 131 
 .../java/demo/jaxrs/tracing/server/Catalog.java| 135 +
 .../demo/jaxrs/tracing/server/CatalogStore.java|  71 +++
 .../META-INF/services/javax.json.spi.JsonProvider  |   1 +
 .../main/resources/OSGI-INF/blueprint/context.xml  |  91 ++
 distribution/src/main/release/samples/pom.xml  |   1 +
 .../karaf/features/src/main/resources/features.xml |   6 +
 parent/pom.xml |   5 +
 10 files changed, 540 insertions(+), 1 deletion(-)

diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/README.txt 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/README.txt
index e53b657..81aeffd 100644
--- 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/README.txt
+++ 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/README.txt
@@ -2,7 +2,7 @@ JAX-RS OpenTracing/Jaeger Demo
 =
 
 The demo shows a basic usage of OpenTracing API + Jaeger distributed tracer 
-with REST based Web Services using  JAX-RS 2.0 (JSR-339). The REST server 
provides the 
+with REST based Web Services using JAX-RS 2.0 (JSR-339). The REST server 
provides the 
 following services at URL http://localhost:9000/catalog: 
 
  - GET to http://localhost:9000/catalog 
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/README.txt
 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/README.txt
new file mode 100644
index 000..41a3cad
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/README.txt
@@ -0,0 +1,98 @@
+JAX-RS OpenTracing/Jaeger Demo in OSGi container
+=
+
+The demo shows a basic usage of OpenTracing API + Jaeger distributed tracer 
+with REST based Web Services using JAX-RS 2.0 (JSR-339), deployed inside OSGi
+container. The server provides the following services at base URL 
+http://localhost:8181/cxf/catalog: 
+
+  GET http://localhost:8181/cxf/catalog 
+  POST http://localhost:8181/cxf/catalog 
+  GET http://localhost:8181/cxf/catalog/
+  DELETE http://localhost:8181/cxf/catalog/
+
+
+Building and running the demo using Maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the Maven pom.xml file can be used to build and run the demo. 
+
+Using either UNIX or Windows:
+
+  mvn install
+  
+Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-4.1.x/quick-start.html)
+
+  bin/karaf
+
+
+  __ __    
+ / //_/ __ _/ __/  
+/ ,<  / __ `/ ___/ __ `/ /_
+   / /| |/ /_/ / /  / /_/ / __/
+  /_/ |_|\__,_/_/   \__,_/_/ 
+  
+Apache Karaf (4.1.2)
+  
+  Hit '' for a list of available commands
+  and '[cmd] --help' for help on a specific command.
+  Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf.
+
+
+In order to install CXF's features, you need to add the CXF's features repo 
using
+
+  feature:repo-add cxf 3.n.m
+
+where 3.n.m corresponds to a valid CXF version number (e.g., 3.2.1).
+
+Install CXF's cxf-tracing-opentracing feature that installs all the required 
bundles
+for this demo bundle.
+
+  feature:install cxf-jaxrs
+  feature:install cxf-jsr-json
+  feature:install cxf-tracing-opentracing
+  
+Install the distributed tracer compatible with OpenTracing API, as in this 
example 
+we are using Uber Jaeger:
+
+  install -s wrap:mvn:com.squareup.okio/okio/1.13.0
+  install -s wrap:mvn:com.squareup.okhttp3/okhttp/3.8.1
+  install -s wrap:mvn:org.apache.thrift/libthrift/0.9.2
+  install -s wrap:mvn:com.uber.jaeger/jaeger-thrift/0.20.6
+  install -s wrap:mvn:com.uber.jaeger/jaeger-core/0.20.6  
+
+Install this demo bundle (using the appropriate bundle version number)
+  
+  install -s mvn:org.apache.cxf.samples/jax_rs_tracing_opentracing_osgi/3.n.m
+
+You can verify if the CXF JAX-RS OpenTracing Blueprint Demo is installed and 
started.
+
+  karaf@root()> list
+  START LEVEL 100 , List Threshold: 50
+   ID | State  | Lvl | Version   | Name
+

svn commit: r1018753 - /websites/production/cxf/content/cache/docs.pageCache

2017-09-26 Thread buildbot 
Author: buildbot
Date: Tue Sep 26 18:56:42 2017
New Revision: 1018753

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache

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

[cxf-fediz] branch master updated: Move to use Java 8's Base64 implementation

2017-09-26 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git


The following commit(s) were added to refs/heads/master by this push:
 new 1744007  Move to use Java 8's Base64 implementation
1744007 is described below

commit 174400758003adabe7510fde2ab78d3dd6d65c13
Author: Colm O hEigeartaigh 
AuthorDate: Tue Sep 26 18:01:42 2017 +0100

Move to use Java 8's Base64 implementation
---
 .../cxf/fediz/core/metadata/MetadataWriter.java|  4 ++--
 .../fediz/core/processor/SAMLProcessorImpl.java| 11 --
 .../org/apache/cxf/fediz/core/util/CertsUtils.java |  9 
 .../cxf/fediz/core/samlsso/SAMLRequestTest.java|  6 +++---
 .../core/samlsso/SAMLResponseConformanceTest.java  |  4 ++--
 .../cxf/fediz/core/samlsso/SAMLResponseTest.java   |  6 +++---
 .../idp/beans/samlsso/AuthnRequestParser.java  |  4 ++--
 .../idp/kerberos/PassThroughKerberosClient.java|  4 ++--
 .../service/idp/metadata/IdpMetadataWriter.java|  6 +++---
 .../idp/metadata/ServiceMetadataWriter.java|  4 ++--
 .../protocols/TrustedIdpOIDCProtocolHandler.java   |  4 +---
 .../protocols/TrustedIdpSAMLProtocolHandler.java   |  4 ++--
 .../service/idp/integrationtests/RestITTest.java   |  4 ++--
 .../org/apache/cxf/fediz/systests/idp/IdpTest.java |  8 +---
 .../cxf/fediz/systests/kerberos/KerberosTest.java  |  4 ++--
 .../apache/cxf/fediz/systests/oidc/OIDCTest.java   |  5 +++--
 .../apache/cxf/fediz/systests/samlsso/IdpTest.java | 24 +-
 17 files changed, 56 insertions(+), 55 deletions(-)

diff --git 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
index 5f5d121..7d7bcc4 100644
--- 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
+++ 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
@@ -28,6 +28,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
+import java.util.Base64;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -47,7 +48,6 @@ import org.apache.cxf.fediz.core.util.CertsUtils;
 import org.apache.cxf.fediz.core.util.DOMUtils;
 import org.apache.cxf.fediz.core.util.SignatureUtils;
 import org.apache.xml.security.stax.impl.util.IDGenerator;
-import org.apache.xml.security.utils.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -303,7 +303,7 @@ public class MetadataWriter {
 + keyAlias);
 }
 byte data[] = cert.getEncoded();
-String encodedCertificate = Base64.encode(data);
+String encodedCertificate = 
Base64.getEncoder().encodeToString(data);
 writer.writeCharacters(encodedCertificate);
 
 writer.writeEndElement(); // X509Certificate
diff --git 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/SAMLProcessorImpl.java
 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/SAMLProcessorImpl.java
index 7b2abc9..60cf3ac 100644
--- 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/SAMLProcessorImpl.java
+++ 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/SAMLProcessorImpl.java
@@ -26,6 +26,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
 import java.security.Signature;
+import java.util.Base64;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -58,8 +59,6 @@ import org.apache.wss4j.common.saml.OpenSAMLUtil;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.DOM2Writer;
 import org.apache.wss4j.dom.WSConstants;
-import org.apache.xml.security.exceptions.Base64DecodingException;
-import org.apache.xml.security.utils.Base64;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.saml2.core.AuthnRequest;
@@ -128,7 +127,7 @@ public class SAMLProcessorImpl extends 
AbstractFedizProcessor {
 
 InputStream tokenStream = null;
 try {
-byte[] deflatedToken = Base64.decode(request.getResponseToken());
+byte[] deflatedToken = 
Base64.getDecoder().decode(request.getResponseToken());
 if (protocol.isDisableDeflateEncoding()) {
 tokenStream = new ByteArrayInputStream(deflatedToken);
 } else {
@@ -136,8 +135,6 @@ public class SAMLProcessorImpl extends 
AbstractFedizProcessor {
 }
 } catch (DataFormatException ex) {
 throw new ProcessingException(TYPE.INVALID_REQUEST);
-} catch (Base64DecodingException e) {
-throw new

[cxf-fediz] branch master updated: Upgrade STS + IdP integration tests to use the jetty9 maven plugin

2017-09-26 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git


The following commit(s) were added to refs/heads/master by this push:
 new 913169d  Upgrade STS + IdP integration tests to use the jetty9 maven 
plugin
913169d is described below

commit 913169ddc74db121fc58f1e7a7019573519dc399
Author: Colm O hEigeartaigh 
AuthorDate: Tue Sep 26 13:38:12 2017 +0100

Upgrade STS + IdP integration tests to use the jetty9 maven plugin
---
 services/idp/pom.xml   | 56 
 services/idp/src/test/resources/jetty-https.xml| 49 ++
 .../idp/src/test/resources/jetty-ssl-context.xml   | 52 +++
 services/idp/src/test/resources/jetty-ssl.xml  | 77 ++
 services/idp/src/test/resources/jetty.xml  | 43 
 services/sts/pom.xml   | 52 ++-
 services/sts/src/test/resources/jetty-https.xml| 49 ++
 .../sts/src/test/resources/jetty-ssl-context.xml   | 52 +++
 services/sts/src/test/resources/jetty-ssl.xml  | 77 ++
 services/sts/src/test/resources/jetty.xml  | 43 
 10 files changed, 506 insertions(+), 44 deletions(-)

diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index 59c2776..4de7835 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -74,6 +74,21 @@
 
 
 
+
+
+src/test/java
+
+**/*.java
+
+
+
+src/test/resources
+
+**/*
+
+true
+
+
 
 
 
@@ -193,7 +208,6 @@
 
 
 idp.https.port
-idp.http.port
 idp.stop.port
 
 
@@ -221,33 +235,23 @@
 
 
 
-org.mortbay.jetty
+org.eclipse.jetty
 jetty-maven-plugin
-8.1.16.v20140903
+${jetty9.version}
+true
 
 ${skipTests}
 ${idp.stop.port}
 STOP
-
-
-${idp.http.port}
-3
-
-
-${idp.https.port}
-3
-
${basedir}/../../examples/samplekeys/idp-ssl-key.jks
-tompass
-tompass
-
-
+
${project.build.directory}/test-classes/jetty.xml,${project.build.directory}/test-classes/jetty-ssl-context.xml,
+
${project.build.directory}/test-classes/jetty-ssl.xml,${project.build.directory}/test-classes/jetty-https.xml
 
-
+
 ${basedir}/target/fediz-idp-sts.war
 /fediz-idp-sts
 
false
 
-
+
 ${basedir}/target/fediz-idp.war
 /fediz-idp
 
@@ -258,7 +262,7 @@
 start-jetty
 pre-integration-test
 
-run-war
+deploy-war
 
 
 0
@@ -348,7 +352,6 @@
 
 
jdbc:hsqldb:target/db/realma/myDB;shutdown=true
 9443
-9080
 realm-a
 
 
@@ -357,11 +360,11 @@
 
 
 
-org.mortbay.jetty
+org.eclipse.jetty
 jetty-maven-plugin
 
 
-
+
 ${basedir}/target/fediz-idp.war
 /fediz-idp
 
@@ -376,7 +379,6 @@
 
 
jdbc:hsqldb:target/db/realmb/myDB;shutdown=true
 12346
-12345
 realm-b
 
 
@@ -385,11 +387,11 @@
 
 
 
-