svn commit: r1011316 - in /websites/production/cxf/content: cache/main.pageCache fediz-downloads.html fediz.html

2017-04-28 Thread buildbot 
Author: buildbot
Date: Fri Apr 28 16:47:38 2017
New Revision: 1011316

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/main.pageCache
websites/production/cxf/content/fediz-downloads.html
websites/production/cxf/content/fediz.html

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

Modified: websites/production/cxf/content/fediz-downloads.html
==
--- websites/production/cxf/content/fediz-downloads.html (original)
+++ websites/production/cxf/content/fediz-downloads.html Fri Apr 28 16:47:38 
2017
@@ -108,7 +108,7 @@ Apache CXF -- Fediz Downloads
  


-Releases1.3.2The 1.3.2 release is our latest release. 
For more information please see the https://issues.apache.org/jira/browse/FEDIZ/fixforversion/12338091;>release
 notes.DescriptionFileMD5SHA1PGPSource distributionhttp://www.apache.org/dyn/closer.lua?path=/cxf/fediz/1.3.2/fediz-1.3.2-source-release.zi
 p">fediz-1.3.2-source-release.ziphttps://www.apache.org/dist/cxf/fediz/1.3.2/fediz-1.3.2-source-release.zip.md5;>fediz-1.3.2-source-release.zip.md5https://www.apache.org/dist/cxf/fediz/1.3.2/fediz-1.3.2-source-release.zip.sha1;>fediz-1.3.2-source-release.zip.sha1https://www.apache.org/dist/cxf/fediz/1.3.2/fediz-1.3.2-source-release.zip.asc;>fediz-1.3.2-source-release.zip.asc1.2.4The 1.2.4 release is our latest release 
of the 1.2.x branch. For more information please see the https://issues.apache.org/jira/browse/FEDIZ/fixforversion/12338219;>r
 elease notes.DescriptionFileMD5SHA1PGPBinary distributionhttp://www.apache.org/dyn/closer.lua?path=/cxf/fediz/1.2.4/apache-fediz-1.2.4.zip;>apache-fediz-1.2.4.ziphttps://www.apache.org/dist/cxf/fediz/1.2.4/apache-fediz-1.2.4.zip.md5;>apache-fediz-1.2.4.zip.md5https://www.apache.org/dist/cxf/fediz/1.2.4/apache-fediz-1.2.4.zip.sha1;>apache-fediz-1.2.4.zip.sha1https://www.apache.org/dist/cxf/fediz/1.2.4/apache-fediz-1.2.4.zip.asc;>apache-fediz-1.2.4.zip.ascSource 
distributionhttp://www.apache.org/dyn/closer.lua?path=/cxf/fediz/1.2.4/fediz-1.2.4-source-release.zip;>fediz-1.2.4-source-release.ziphttps://www.apache.org/dist/cxf/fediz/1.2.4/fediz-1.2.4-source-release.zip.md5;>fediz-1.2.4-source-release.zip.md5https://www.a
 
pache.org/dist/cxf/fediz/1.2.4/fediz-1.2.4-source-release.zip.sha1">fediz-1.2.4-source-release.zip.sha1https://www.apache.org/dist/cxf/fediz/1.2.4/fediz-1.2.4-source-release.zip.asc;>fediz-1.2.4-source-release.zip.ascVerifying ReleasesWhen 
downloading from a mirror please check the SHA1/MD5 checksums as well as 
verifying the OpenPGP compatible signature available from the main Apache site. 
The https://www.apache.org/dist/cxf/KEYS;>KEYS file contains the public 
keys used for signing the release. It is recommended that a web of trust is 
used to confirm the identity of these keys.You can check the OpenPGP 
signature with GnuPG via:
+Releases1.4.0The 1.4.0 release is our latest release. 
For more information please see the https://issues.apache.org/jira/browse/FEDIZ/fixforversion/12338680;>release
 notes.DescriptionFileMD5SHA1PGPSource distributionhttp://www.apache.org/dyn/closer.lua?path=/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zi
 p">fediz-1.4.0-source-release.ziphttps://www.apache.org/dist/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.md5;>fediz-1.4.0-source-release.zip.md5https://www.apache.org/dist/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.sha1;>fediz-1.4.0-source-release.zip.sha1https://www.apache.org/dist/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.asc;>fediz-1.4.0-source-release.zip.asc1.3.2The 1.3.2 release is our latest release 
of the 1.3.x branch. For more information please see the https://issues.apache.org/jira/browse/FEDIZ/fixforversion/12338091;>r
 elease notes.DescriptionFileMD5SHA1PGPSource distributionhttp://www.apache.org/dyn/closer.lua?path=/cxf/fediz/1.3.2/fediz-1.3.2-source-release.zip;>fediz-1.3.2-source-release.ziphttps://www.apache.org/dist/cxf/fediz/1.3.2/fediz-1.3.2-source-release.zip.md5;>fediz-1.3.2-source-release.zip.md5https://www.apache.org/dist/cxf/fediz/1.3.2/fediz-1.3.2-source-release.zip.sha1;>fediz-1.3.2-source-release.zip.sha1https://www.apache.org/dist/cxf/fediz/1.3.2/fediz-1.3.2-source-release.zip.asc;>fediz-1.3.2-source-release.zip.asc1.2.4The 1.2.4 release is our latest release 
of the 1.2.x branch. For more information please see the https://issues.apache.org/jira/browse/FEDIZ/fixforversion/12338219;>release
 notes.DescriptionFileMD5SHA1PGPBinary

cxf git commit: Fixing a typo

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 10d845b61 -> 20efc30eb


Fixing a typo


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

Branch: refs/heads/3.1.x-fixes
Commit: 20efc30eb21f5f32a1a3de1eb5ea41f8dd01776c
Parents: 10d845b
Author: Sergey Beryozkin 
Authored: Fri Apr 28 17:13:59 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 17:14:43 2017 +0100

--
 .../java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/20efc30e/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
index 3952dd6..f5e8c8f 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
@@ -45,7 +45,7 @@ public class OsgiSwaggerUiResolver extends SwaggerUiResolver {
 return null;
 }
 String[] locations = swaggerUiMavenGroupAndArtifact == null ? 
DEFAULT_LOCATIONS
-: new String[]{"mvn:" + DEFAULT_COORDINATES + "/",
+: new String[]{"mvn:" + swaggerUiMavenGroupAndArtifact + "/",
"wrap:mvn:" + swaggerUiMavenGroupAndArtifact + 
"/"};
 for (Bundle b : bundle.getBundleContext().getBundles()) {
 String location = b.getLocation();

cxf git commit: Fixing a typo

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master dd3cb8eb8 -> a36af6323


Fixing a typo


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

Branch: refs/heads/master
Commit: a36af6323505211479c875fb9923cc6dcbc6ac95
Parents: dd3cb8e
Author: Sergey Beryozkin 
Authored: Fri Apr 28 17:13:59 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 17:13:59 2017 +0100

--
 .../java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a36af632/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
index 32493a1..b522f1b 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
@@ -45,7 +45,7 @@ public class OsgiSwaggerUiResolver extends SwaggerUiResolver {
 return null;
 }
 String[] locations = swaggerUiMavenGroupAndArtifact == null ? 
DEFAULT_LOCATIONS
-: new String[]{"mvn:" + DEFAULT_COORDINATES + "/",
+: new String[]{"mvn:" + swaggerUiMavenGroupAndArtifact + "/",
"wrap:mvn:" + swaggerUiMavenGroupAndArtifact + 
"/"};
 for (Bundle b : bundle.getBundleContext().getBundles()) {
 String location = b.getLocation();

cxf git commit: [CXF-7353] Initial support for custom Swagger UI coordinates

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 90ae7f335 -> 10d845b61


[CXF-7353] Initial support for custom Swagger UI coordinates


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

Branch: refs/heads/3.1.x-fixes
Commit: 10d845b61d65724583b9fbf80d95bd929a1410d7
Parents: 90ae7f3
Author: Sergey Beryozkin 
Authored: Fri Apr 28 17:07:22 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 17:10:21 2017 +0100

--
 .../jaxrs/swagger/OsgiSwaggerUiResolver.java| 20 +---
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 13 -
 .../cxf/jaxrs/swagger/SwaggerUiResolver.java| 14 +-
 3 files changed, 34 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/10d845b6/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
index 0272407..3952dd6 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
@@ -26,25 +26,31 @@ import org.osgi.framework.FrameworkUtil;
 import io.swagger.annotations.Api;
 
 public class OsgiSwaggerUiResolver extends SwaggerUiResolver {
-private static final String LOCATIONS[] = {
-"mvn:org.webjars/swagger-ui/",
-"wrap:mvn:org.webjars/swagger-ui/"
+private static final String DEFAULT_COORDINATES = "org.webjars/swagger-ui";
+private static final String DEFAULT_LOCATIONS[] = {
+"mvn:" + DEFAULT_COORDINATES + "/",
+"wrap:mvn:" + DEFAULT_COORDINATES + "/"
 };
 
 OsgiSwaggerUiResolver() throws Exception {
 Class.forName("org.osgi.framework.FrameworkUtil");
 }
-
-protected String findSwaggerUiRootInternal(String swaggerUiVersion) {
+
+@Override
+protected String findSwaggerUiRootInternal(String 
swaggerUiMavenGroupAndArtifact,
+   String swaggerUiVersion) {
 try {
 Bundle bundle = FrameworkUtil.getBundle(Api.class);
 if (bundle == null) {
 return null;
 }
+String[] locations = swaggerUiMavenGroupAndArtifact == null ? 
DEFAULT_LOCATIONS
+: new String[]{"mvn:" + DEFAULT_COORDINATES + "/",
+   "wrap:mvn:" + swaggerUiMavenGroupAndArtifact + 
"/"};
 for (Bundle b : bundle.getBundleContext().getBundles()) {
 String location = b.getLocation();
-
-for (String pattern: LOCATIONS) {
+
+for (String pattern: locations) {
 if (swaggerUiVersion != null) {
 if (location.equals(pattern + swaggerUiVersion)) {
 return getSwaggerUiRoot(b, swaggerUiVersion);

http://git-wip-us.apache.org/repos/asf/cxf/blob/10d845b6/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 4458df5..5d87e45 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -89,6 +89,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 private boolean supportSwaggerUi = true;
 
 private String swaggerUiVersion;
+
+private String swaggerUiMavenGroupAndArtifact;
 
 private Map swaggerUiMediaTypes;
 
@@ -134,7 +136,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 }
 
 if (supportSwaggerUi) {
-String swaggerUiRoot = 
SwaggerUiResolver.findSwaggerUiRoot(swaggerUiVersion);
+String swaggerUiRoot = 
SwaggerUiResolver.findSwaggerUiRoot(swaggerUiMavenGroupAndArtifact, 
+   
swaggerUiVersion);
 if (swaggerUiRoot != null) {
 SwaggerUIService swaggerUiService = new

cxf git commit: [CXF-7353] Initial support for custom Swagger UI coordinates

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 99f6eb63f -> dd3cb8eb8


[CXF-7353] Initial support for custom Swagger UI coordinates


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

Branch: refs/heads/master
Commit: dd3cb8eb84f1f17ebadb4104873faa4f17377a96
Parents: 99f6eb6
Author: Sergey Beryozkin 
Authored: Fri Apr 28 17:07:22 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 17:07:22 2017 +0100

--
 .../cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java| 16 +++-
 .../apache/cxf/jaxrs/swagger/Swagger2Feature.java   | 13 -
 .../apache/cxf/jaxrs/swagger/SwaggerUiResolver.java | 12 
 3 files changed, 31 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/dd3cb8eb/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
index 1350fcd..32493a1 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
@@ -26,25 +26,31 @@ import org.osgi.framework.FrameworkUtil;
 import io.swagger.annotations.Api;
 
 public class OsgiSwaggerUiResolver extends SwaggerUiResolver {
-private static final String LOCATIONS[] = {
-"mvn:org.webjars/swagger-ui/",
-"wrap:mvn:org.webjars/swagger-ui/"
+private static final String DEFAULT_COORDINATES = "org.webjars/swagger-ui";
+private static final String DEFAULT_LOCATIONS[] = {
+"mvn:" + DEFAULT_COORDINATES + "/",
+"wrap:mvn:" + DEFAULT_COORDINATES + "/"
 };
 
 OsgiSwaggerUiResolver() throws Exception {
 Class.forName("org.osgi.framework.FrameworkUtil");
 }
 
-protected String findSwaggerUiRootInternal(String swaggerUiVersion) {
+@Override
+protected String findSwaggerUiRootInternal(String 
swaggerUiMavenGroupAndArtifact,
+   String swaggerUiVersion) {
 try {
 Bundle bundle = FrameworkUtil.getBundle(Api.class);
 if (bundle == null) {
 return null;
 }
+String[] locations = swaggerUiMavenGroupAndArtifact == null ? 
DEFAULT_LOCATIONS
+: new String[]{"mvn:" + DEFAULT_COORDINATES + "/",
+   "wrap:mvn:" + swaggerUiMavenGroupAndArtifact + 
"/"};
 for (Bundle b : bundle.getBundleContext().getBundles()) {
 String location = b.getLocation();
 
-for (String pattern: LOCATIONS) {
+for (String pattern: locations) {
 if (swaggerUiVersion != null) {
 if (location.equals(pattern + swaggerUiVersion)) {
 return getSwaggerUiRoot(b, swaggerUiVersion);

http://git-wip-us.apache.org/repos/asf/cxf/blob/dd3cb8eb/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index fd57b64..5696c94 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -89,6 +89,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 private boolean supportSwaggerUi = true;
 
 private String swaggerUiVersion;
+
+private String swaggerUiMavenGroupAndArtifact;
 
 private Map swaggerUiMediaTypes;
 
@@ -134,7 +136,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 }
 
 if (supportSwaggerUi) {
-String swaggerUiRoot = 
SwaggerUiResolver.findSwaggerUiRoot(swaggerUiVersion);
+String swaggerUiRoot = 
SwaggerUiResolver.findSwaggerUiRoot(swaggerUiMavenGroupAndArtifact, 
+   
swaggerUiVersion);
 if (swaggerUiRoot != null) {
 SwaggerUIService swaggerUiService = new 
SwaggerUIService(swaggerUiRoot, swaggerUiMediaTypes);

svn commit: r19400 - in /release/cxf/fediz/1.4.0: ./ fediz-1.4.0-source-release.zip fediz-1.4.0-source-release.zip.asc fediz-1.4.0-source-release.zip.md5 fediz-1.4.0-source-release.zip.sha1

2017-04-28 Thread coheigea 
Author: coheigea
Date: Fri Apr 28 16:00:02 2017
New Revision: 19400

Log:
Adding 1.4.0 release

Added:
release/cxf/fediz/1.4.0/
release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip   (with props)
release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.asc
release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.md5
release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.sha1

Added: release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip
==
Binary file - no diff available.

Propchange: release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.asc
==
--- release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.asc (added)
+++ release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.asc Fri Apr 28 
16:00:02 2017
@@ -0,0 +1,10 @@
+-BEGIN PGP SIGNATURE-
+
+iQEcBAABCAAGBQJY/zQPAAoJEGe/gLEK1TmDh7wH/ReMKi97lD6kF9O8dY+H2PYY
+IYQq4ZOcCnTjcBR9uudIM/57gYIMStwDRl+NaQ7n3K/CGkSa4jncuQsHgZJunWRe
+aON/RD2JqsdOpt2bfd87h5py3WJWDS1qTgqJcQNvkV+XDb9IxdqGVYWuBCayPv5/
+fV/5XxFugB8BLtiD+pXAUSr42gQeUEcHsgvxjPas712PpcPIyRjXr0R63l0m7b21
+ExaPndBfHDEblURrqJ9qSbIy/qe7iWavpxu+3Bv1YM2sgyAZuXNNqa0xX6jvosJ6
+8/oNN1kpAfgOqBFaPj7kBh/P3DZfTPsdh9bb2H3dSMllTBCQtjQJj3xvbJI6KJA=
+=7Lte
+-END PGP SIGNATURE-

Added: release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.md5
==
--- release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.md5 (added)
+++ release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.md5 Fri Apr 28 
16:00:02 2017
@@ -0,0 +1 @@
+c6f5fe0bfc19d704257f8b2479f1891b
\ No newline at end of file

Added: release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.sha1
==
--- release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.sha1 (added)
+++ release/cxf/fediz/1.4.0/fediz-1.4.0-source-release.zip.sha1 Fri Apr 28 
16:00:02 2017
@@ -0,0 +1 @@
+8d5632dbf830e9324b6200c17881687a7cecaa8d
\ No newline at end of file

cxf git commit: [CXF-7320] Unwrapping a charset if needed

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes fa4ae6a45 -> f29db4a71


[CXF-7320] Unwrapping a charset if needed


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

Branch: refs/heads/3.0.x-fixes
Commit: f29db4a717731915290ac3193d8d55cf11feb002
Parents: fa4ae6a
Author: Sergey Beryozkin 
Authored: Fri Apr 28 16:38:48 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 16:46:38 2017 +0100

--
 .../org/apache/cxf/jaxrs/utils/HttpUtils.java | 18 ++
 .../org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 17 +
 2 files changed, 31 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f29db4a7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index fed0204..1c4459d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -80,7 +80,8 @@ public final class HttpUtils {
 
 private static final Pattern ENCODE_PATTERN = 
Pattern.compile("%[0-9a-fA-F][0-9a-fA-F]");
 private static final String CHARSET_PARAMETER = "charset";
-
+private static final String DOUBLE_QUOTE = "\"";
+
 // there are more of such characters, ex, '*' but '*' is not affected by 
UrlEncode
 private static final String PATH_RESERVED_CHARACTERS = "=@/:!$&\'(),;~";
 private static final String QUERY_RESERVED_CHARACTERS = "?/,";
@@ -544,7 +545,7 @@ public final class HttpUtils {
  
 public static String getSetEncoding(MediaType mt, MultivaluedMap headers,
 String defaultEncoding) {
-String enc = mt.getParameters().get(CHARSET_PARAMETER);
+String enc = getMediaTypeCharsetParameter(mt);
 if (enc == null) {
 return defaultEncoding;
 }
@@ -564,10 +565,19 @@ public final class HttpUtils {
 }
 
 public static String getEncoding(MediaType mt, String defaultEncoding) {
-String charset = mt == null ? defaultEncoding : 
mt.getParameters().get("charset");
+String charset = mt == null ? defaultEncoding : 
getMediaTypeCharsetParameter(mt);
 return charset == null ? defaultEncoding : charset;
 }
-
+
+public static String getMediaTypeCharsetParameter(MediaType mt) {
+String charset = mt.getParameters().get(CHARSET_PARAMETER);
+if (charset != null && charset.startsWith(DOUBLE_QUOTE) 
+&& charset.endsWith(DOUBLE_QUOTE) && charset.length() > 1) {
+charset = charset.substring(1,  charset.length() - 1);
+}
+return charset;
+}
+
 public static URI resolve(UriBuilder baseBuilder, URI uri) {
 if (!uri.isAbsolute()) {
 return baseBuilder.build().resolve(uri);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f29db4a7/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index a6de9db..2dbcace 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -23,6 +23,7 @@ import java.net.URI;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.cxf.jaxrs.model.ParameterType;
@@ -84,6 +85,22 @@ public class HttpUtilsTest extends Assert {
 }
 
 @Test
+public void testMediaTypeWithUTF8() {
+assertEquals("UTF-8",
+ 
HttpUtils.getEncoding(MediaType.valueOf("application/json;charset=UTF-8"), 
"UTF-16"));
+}
+@Test
+public void testMediaTypeWithUTF8WithQuotes() {
+assertEquals("UTF-8",
+ 
HttpUtils.getEncoding(MediaType.valueOf("application/json;charset=\"UTF-8\""), 
"UTF-16"));
+}
+@Test
+public void testMediaTypeWithNoCharset() {
+assertEquals("UTF-16",
+ 
HttpUtils.getEncoding(MediaType.valueOf("application/json"), "UTF-16"));
+}
+
+@Test
 public void

cxf git commit: [CXF-7320] Unwrapping a charset if needed

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a57148a70 -> 90ae7f335


[CXF-7320] Unwrapping a charset if needed


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

Branch: refs/heads/3.1.x-fixes
Commit: 90ae7f33580948c08bc26ce5bf0fb3294f6000f9
Parents: a57148a
Author: Sergey Beryozkin 
Authored: Fri Apr 28 16:38:48 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 16:45:45 2017 +0100

--
 .../org/apache/cxf/jaxrs/utils/HttpUtils.java | 18 ++
 .../org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 17 +
 2 files changed, 31 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/90ae7f33/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index e76cbd0..e77f6e2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -86,7 +86,8 @@ public final class HttpUtils {
 
 private static final Pattern ENCODE_PATTERN = 
Pattern.compile("%[0-9a-fA-F][0-9a-fA-F]");
 private static final String CHARSET_PARAMETER = "charset";
-
+private static final String DOUBLE_QUOTE = "\"";
+
 // there are more of such characters, ex, '*' but '*' is not affected by 
UrlEncode
 private static final String PATH_RESERVED_CHARACTERS = "=@/:!$&\'(),;~";
 private static final String QUERY_RESERVED_CHARACTERS = "?/,";
@@ -550,7 +551,7 @@ public final class HttpUtils {
  
 public static String getSetEncoding(MediaType mt, MultivaluedMap headers,
 String defaultEncoding) {
-String enc = mt.getParameters().get(CHARSET_PARAMETER);
+String enc = getMediaTypeCharsetParameter(mt);
 if (enc == null) {
 return defaultEncoding;
 }
@@ -570,10 +571,19 @@ public final class HttpUtils {
 }
 
 public static String getEncoding(MediaType mt, String defaultEncoding) {
-String charset = mt == null ? defaultEncoding : 
mt.getParameters().get("charset");
+String charset = mt == null ? defaultEncoding : 
getMediaTypeCharsetParameter(mt);
 return charset == null ? defaultEncoding : charset;
 }
-
+
+public static String getMediaTypeCharsetParameter(MediaType mt) {
+String charset = mt.getParameters().get(CHARSET_PARAMETER);
+if (charset != null && charset.startsWith(DOUBLE_QUOTE) 
+&& charset.endsWith(DOUBLE_QUOTE) && charset.length() > 1) {
+charset = charset.substring(1,  charset.length() - 1);
+}
+return charset;
+}
+
 public static URI resolve(UriBuilder baseBuilder, URI uri) {
 if (!uri.isAbsolute()) {
 return baseBuilder.build().resolve(uri);

http://git-wip-us.apache.org/repos/asf/cxf/blob/90ae7f33/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index a6de9db..2dbcace 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -23,6 +23,7 @@ import java.net.URI;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.cxf.jaxrs.model.ParameterType;
@@ -84,6 +85,22 @@ public class HttpUtilsTest extends Assert {
 }
 
 @Test
+public void testMediaTypeWithUTF8() {
+assertEquals("UTF-8",
+ 
HttpUtils.getEncoding(MediaType.valueOf("application/json;charset=UTF-8"), 
"UTF-16"));
+}
+@Test
+public void testMediaTypeWithUTF8WithQuotes() {
+assertEquals("UTF-8",
+ 
HttpUtils.getEncoding(MediaType.valueOf("application/json;charset=\"UTF-8\""), 
"UTF-16"));
+}
+@Test
+public void testMediaTypeWithNoCharset() {
+assertEquals("UTF-16",
+ 
HttpUtils.getEncoding(MediaType.valueOf("application/json"), "UTF-16"));
+}
+
+@Test
 public void

cxf git commit: Use karaf 4.1.1 minimal and activemq 5.14.5 in OSGi itests

2017-04-28 Thread cschneider 
Repository: cxf
Updated Branches:
  refs/heads/master c1ba5d90e -> d7d30736a


Use karaf 4.1.1 minimal and activemq 5.14.5 in OSGi itests


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

Branch: refs/heads/master
Commit: d7d30736aae953b2f7a4415f1ea575bfc6e43ae2
Parents: c1ba5d9
Author: Christian Schneider 
Authored: Fri Apr 28 17:28:32 2017 +0200
Committer: Christian Schneider 
Committed: Fri Apr 28 17:28:32 2017 +0200

--
 osgi/itests/pom.xml   |  7 +--
 .../apache/cxf/osgi/itests/BundlesAndNamespacesTest.java  |  7 ++-
 .../org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java| 10 +-
 .../apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java|  2 +-
 .../apache/cxf/osgi/itests/jaxrs/JaxRsTestActivator.java  |  1 +
 .../org/apache/cxf/osgi/itests/soap/HttpServiceTest.java  |  1 +
 .../org/apache/cxf/osgi/itests/soap/JmsServiceTest.java   |  2 +-
 .../src/test/resources/etc/org.ops4j.pax.logging.cfg  |  2 +-
 parent/pom.xml|  4 ++--
 9 files changed, 15 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/pom.xml
--
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 800d50d..ed4e0be 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -100,11 +100,6 @@
 ${cxf.karaf.version}
 
 
-org.apache.karaf.shell
-org.apache.karaf.shell.core
-${cxf.karaf.version}
-
-
 org.apache.servicemix.specs
 
org.apache.servicemix.specs.jsr303-api-1.1.0
 ${cxf.servicemix.specs.version}
@@ -175,7 +170,7 @@
 
 
 org.apache.karaf
-apache-karaf
+apache-karaf-minimal
 ${cxf.karaf.version}
 tar.gz
 test

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
--
diff --git 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
index 7a85f43..5640197 100644
--- 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
+++ 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
@@ -19,7 +19,6 @@
 
 package org.apache.cxf.osgi.itests;
 
-import java.io.File;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -31,7 +30,6 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
 
 import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
 import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
@@ -55,9 +53,8 @@ public class BundlesAndNamespacesTest extends 
CXFOSGiTestSupport {
 public Option[] config() {
 return new Option[]{
 cxfBaseConfig(),
-replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg",
- new 
File("src/test/resources/etc/org.ops4j.pax.logging.cfg")),
-features(cxfUrl, "cxf-core", "cxf-jaxws"),
+
+features(cxfUrl, "aries-blueprint", "cxf-core", "cxf-jaxws"),
 logLevel(LogLevel.INFO)};
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
--
diff --git 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index c0c6a8a..5773e18 100644
--- 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -34,7 +34,6 @@ import org.apache.karaf.features.FeaturesService;
 import org.junit.Assert;
 import org.ops4j.pax.exam.MavenUtils;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.ops4j.pax.exam.options.MavenUrlReference;
 import org.osgi.framework.Bundle;
 import

svn commit: r1011312 - in /websites/production/cxf/content: cache/docs.pageCache docs/jax-rs-oauth2.html

2017-04-28 Thread buildbot 
Author: buildbot
Date: Fri Apr 28 14:47:41 2017
New Revision: 1011312

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jax-rs-oauth2.html

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

Modified: websites/production/cxf/content/docs/jax-rs-oauth2.html
==
--- websites/production/cxf/content/docs/jax-rs-oauth2.html (original)
+++ websites/production/cxf/content/docs/jax-rs-oauth2.html Fri Apr 28 14:47:41 
2017
@@ -118,11 +118,11 @@ Apache CXF -- JAX-RS OAuth2


 JAX-RS: 
OAuth2/**/
+/*]]>*/
 JAX-RS: OAuth2IntroductionMaven dependenciesClient 
RegistrationDeveloping OAuth2 Servers
 Authorization Service
 How to create Authorization 
ViewEndUser Name in 
Authorization FormPublic Clients (Devices)
@@ -141,7 +141,9 @@ div.rbtoc1478882820758 li {margin-left:
 OAuth 
Server JAX-RS endpoints
 AuthorizationCode
 and Implicit Services on the same relative path
 
-Third Party Client 
AuthenticationUser Session Authenticity
+Third Party Client 
Authentication
+Client Certificate 
Authentication
+User 
Session Authenticity
 Keeping the state in the 
sessionMultiple Factor 
Verification
 Customizing End 
User Subject initializationProtecting resources 
with OAuth filters
 OAuth2 tokens and SOAP 
endpoints
@@ -152,7 +154,7 @@ div.rbtoc1478882820758 li {margin-left:
 Sharing 
the same access path between end users and clientsProviding
 different access points to end users and clients
 Single Sign 
On
 
-IntroductionNew:Ehcache and JCache OAuthDataProviders can 
represent access tokens in JWTJPA2 OAuthDataProvider 
improvedDynamicRegistrationService addedCXF provides the implementation of http://tools.ietf.org/html/rfc6749; 
rel="nofollow">OAuth 2.0. See also the JAX-RS OAuth page for information about OAuth 
1.0.Authorization Code, Implicit, Client Credentials, Resource Owner 
Password Credentials, Refresh Token, SAML2 Assertions and JWT assertion grants 
are currently supported.Custom grant handlers can be 
registered.OAuth2 is a new protocol which offers a complex yet elegant 
solution toward helping end users (resource owners) authorize third-party 
providers to access their resources.The OAuth2 flow which is clo
 sely related to the original OAuth 1.0 3-leg flow is called Authorization Code 
and involves 3 parties: the end user, the third party service (client) and the 
resource server which is protected by OAuth2 filters. Typically a client offers 
a service feature that an end user requests and which requires the former to 
access one or more protected resources on behalf of this user which are located 
at the resource server. For example, the client may need to access the end 
user's photos in order to print them and post to the user or read and possibly 
update a user's calendar in order to make a booking.In order to make it 
happen, the third-party service application/client needs to register itself 
with the OAuth2 server. This happens out-of-band and after the registration the 
client gets back a client key and secret pair. Typically the client is expected 
to provide the name and description of the application, the application logo 
URI, one or more redirect URIs, and other information th
 at may help the OAuth2 authorization server to identify this client to the end 
user at the authorization time.From then on, the authorization code flow 
works like this: 1. End User requests the third-party service 
using a browser.2. The client redirects the end user to OAuth2 
Authorization Service, adding its client id, the state, redirect URI and the 
optional scope to the target URI. The state parameter represents the current 
end user's request, redirect URI - where the authorization code is expected to 
be returned to, and the scope is the list of opaque permissions that the client 
needs in order to access the protected resources.3. Authorization 
Service will retrieve the information about the client using its client id, 
build an HTML form and return it to the end user. The form will ask the user if 
a given third-party application can be allowed to access some resources on 
behalf of this user.4. If the user approves it then Authorization
  Service will generate an authorization code and redirect the user back to the 
redirect uri provided by the client, also adding a state parameter to the 
redirect URI.5. The client requests an

cxf git commit: Refactored OSGi tests

2017-04-28 Thread cschneider 
Repository: cxf
Updated Branches:
  refs/heads/master 02fd70cd6 -> c1ba5d90e


Refactored OSGi tests


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

Branch: refs/heads/master
Commit: c1ba5d90e34993d737f0944dbb69ccda7c4bcfd1
Parents: 02fd70c
Author: Christian Schneider 
Authored: Fri Apr 28 15:46:07 2017 +0200
Committer: Christian Schneider 
Committed: Fri Apr 28 15:46:07 2017 +0200

--
 .../cxf/osgi/itests/CXFOSGiTestSupport.java | 20 --
 .../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 39 +---
 .../osgi/itests/jaxrs/JaxRsTestActivator.java   |  2 -
 .../cxf/osgi/itests/soap/HttpTestActivator.java | 17 -
 .../cxf/osgi/itests/soap/JmsServiceTest.java| 12 +-
 5 files changed, 35 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c1ba5d90/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
--
diff --git 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 4a5d107..c0c6a8a 100644
--- 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -34,6 +34,7 @@ import org.apache.karaf.features.FeaturesService;
 import org.junit.Assert;
 import org.ops4j.pax.exam.MavenUtils;
 import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.ops4j.pax.exam.options.MavenUrlReference;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -46,6 +47,7 @@ import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.CoreOptions.when;
 import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
 
 /**
  *
@@ -62,20 +64,10 @@ public class CXFOSGiTestSupport {
 
 protected MavenUrlReference cxfUrl;
 protected MavenUrlReference karafUrl;
+protected MavenUrlReference amqUrl;
 
 private static String getKarafVersion() {
-String karafVersion = 
MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
-if (karafVersion == null) {
-karafVersion = System.getProperty("cxf.karaf.version");
-}
-if (karafVersion == null) {
-karafVersion = System.getProperty("karaf.version");
-}
-if (karafVersion == null) {
-// setup the default version of it
-karafVersion = "4.0.5";
-}
-return karafVersion;
+return MavenUtils.getArtifactVersion("org.apache.karaf", 
"apache-karaf");
 }
 
 /**
@@ -88,6 +80,8 @@ public class CXFOSGiTestSupport {
 .type("tar.gz");
 cxfUrl = 
maven().groupId("org.apache.cxf.karaf").artifactId("apache-cxf").versionAsInProject()
 .type("xml").classifier("features");
+amqUrl = maven().groupId("org.apache.activemq")
+
.artifactId("activemq-karaf").type("xml").classifier("features").versionAsInProject();
 String localRepo = System.getProperty("localRepository");
 Object urp = System.getProperty("cxf.useRandomFirstPort");
 return composite(karafDistributionConfiguration()
@@ -101,6 +95,7 @@ public class CXFOSGiTestSupport {
  //debugConfiguration(), // nor this
  
systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
  systemProperty("java.awt.headless").value("true"),
+ logLevel(LogLevel.INFO),
  when(localRepo != null)
  
.useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
   
"org.ops4j.pax.url.mvn.localRepository",
@@ -198,4 +193,5 @@ public class CXFOSGiTestSupport {
 
assertServicePublished(String.format("(&(objectClass=org.apache.aries.blueprint.NamespaceHandler)"
  + 
"(osgi.service.blueprint.namespace=%s))", namespace), timeout);
 }
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/c1ba5d90/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java

Nexus: Promotion Completed

2017-04-28 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.7.0_80; Linux 4.8.0-46-generic)""userId" = "coheigea""ip" = "37.228.231.149"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.0/fediz-systests-idp-1.4.0.pom(SHA1: 2efe2ef16afba0e6d2e85a61270a59b1a51a394c)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.0/fediz-systests-idp-1.4.0-sources.jar(SHA1: a843f97629ff1fb2a4d1d84ed31a7cb280895469)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.0/fediz-systests-idp-1.4.0-sources.jar.asc(SHA1: 055fcdf1d6c01e29be0bd829324b6e0a43a3e73b)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.0/fediz-systests-idp-1.4.0.jar(SHA1: 8043d1705e438faed1325054608d28456db7d959)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.0/fediz-systests-idp-1.4.0.jar.asc(SHA1: 6b7cdf819452cd5040e46e05595635cd0f6c3032)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.0/fediz-systests-idp-1.4.0.pom.asc(SHA1: d194e6e2d8aa6b36891bc876210fbc59653bb63c)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.0/fediz-systests-jetty9-1.4.0.jar(SHA1: 312a673ba1a12a31334691123412c97c13bb1616)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.0/fediz-systests-jetty9-1.4.0-sources.jar.asc(SHA1: fba0ae48e0b1ffccfd27f737fadf3bb83d366e5f)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.0/fediz-systests-jetty9-1.4.0.pom(SHA1: 4cd6d56a17f11e264ad29d5dc6f78c084c08cbba)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.0/fediz-systests-jetty9-1.4.0-sources.jar(SHA1: 8c7aacfca920262927940c018e03adb42aaad68a)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.0/fediz-systests-jetty9-1.4.0.jar.asc(SHA1: cf6f88df15c134b57e801a0e2b04b1a8a697acad)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.0/fediz-systests-jetty9-1.4.0.pom.asc(SHA1: afb12ba1fb137d43129178846756e1e92390f2fa)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.0/fediz-systests-oidc-1.4.0.jar.asc(SHA1: 108f0e227f9194e3ddbbdc629bcc1093c1d70e49)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.0/fediz-systests-oidc-1.4.0-sources.jar.asc(SHA1: 6250668901fbbb55e4836e07d771d265cc2db6c1)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.0/fediz-systests-oidc-1.4.0.pom.asc(SHA1: b17b4767d101e17e959f0951e1614d2d8d2d51c0)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.0/fediz-systests-oidc-1.4.0.pom(SHA1: 69ef4a94f7ac6c863fa07cb540915f63eb1cf903)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.0/fediz-systests-oidc-1.4.0-sources.jar(SHA1: 26717d8120350e9730eb96b0348b5f3dcb9188a4)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.0/fediz-systests-oidc-1.4.0.jar(SHA1: 86cc43a2ed9e2c164d6f25419c2cb45e017fe8da)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.0/fediz-systests-tomcat7-1.4.0.pom.asc(SHA1: 06087bf5f1221ac647a07f42d4e8f0c547a7aa73)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.0/fediz-systests-tomcat7-1.4.0-sources.jar.asc(SHA1: d79de8e073707d5eb7a71f048423afc5df462b9f)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.0/fediz-systests-tomcat7-1.4.0.pom(SHA1: 3a562b9975fef44507d650b53c6ae40080385c80)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.0/fediz-systests-tomcat7-1.4.0-sources.jar(SHA1: b00ceb9be3aebe226cd6844de2c894ebfb361190)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.0/fediz-systests-tomcat7-1.4.0.jar.asc(SHA1: 79aeb28372474b368c98014cfc71c6f8dabb520d)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.0/fediz-systests-tomcat7-1.4.0.jar(SHA1: 4e718ca245895c04e6562ecebf9189c657d09598)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.0/fediz-systests-tomcat8-1.4.0-sources.jar.asc(SHA1: 4282217499509b17f67b454e8c8bc7d4d2ad4b1e)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.0/fediz-systests-tomcat8-1.4.0.jar.asc(SHA1: 9b1ec8c27ff7c660ea53a76b364add4fd49a9613)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.0/fediz-systests-tomcat8-1.4.0.jar(SHA1: 6b3b00065746dc1f8eb423009c0e3edcafdf12f3)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.0/fediz-systests-tomcat8-1.4.0.pom.asc(SHA1: 3d47cfcb8566e4b4e843df6541e32f9eae18f6e8)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.0/fediz-systests-tomcat8-1.4.0.pom(SHA1: be0a2b18367320f0b4ff155bec052c8d2155ea00)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.0/fediz-systests-tomcat8-1.4.0-sources.jar(SHA1: 39c3dad101dcfffef7c9d42dba38c5d5a4fe2522)/org/apache/cxf/fediz/systests/webapps/fediz-systests-webapps-simple/1.4.0/fediz-systests-webapps-simple-1.4.0-sources.jar.asc(SHA1: 13cddcf38017c5b06d18867c11c79af555a9e929)/org/apache/cxf/fediz/systests/webapps/fediz-systests-webapps-simple/1.4.0/fediz-systests-webapps-simple-1.4.0.pom(SHA1: ba0c58c53515998ab0c3ce2cf5000c1890008088)/org/apache/cxf/fediz/systests/webapps/fediz-systests-webapps-simple/1.4.0/fediz-systests-webapps-simple-1.4.0.war.asc(SHA1:

cxf git commit: Extract connection closing

2017-04-28 Thread cschneider 
Repository: cxf
Updated Branches:
  refs/heads/master ab25fa963 -> 02fd70cd6


Extract connection closing


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

Branch: refs/heads/master
Commit: 02fd70cd617803bb3beba7f7df3e9b121a344735
Parents: ab25fa9
Author: Christian Schneider 
Authored: Fri Apr 28 15:16:43 2017 +0200
Committer: Christian Schneider 
Committed: Fri Apr 28 15:16:53 2017 +0200

--
 .../cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 47 +++-
 1 file changed, 15 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/02fd70cd/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
index 96d2898..bf6ec2a 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
@@ -126,14 +126,7 @@ public class JAXRSJmsTest extends 
AbstractBusClientServerTestBase {
 checkBookInResponse(session, replyToDestination, 129L, "OneWay 
From WebClient");
 session.close();
 } finally {
-try {
-if (connection != null) {
-connection.stop();
-connection.close();
-}
-} catch (JMSException ex) {
-// ignore
-}
+close(connection);
 }
 }
 
@@ -217,14 +210,7 @@ public class JAXRSJmsTest extends 
AbstractBusClientServerTestBase {
 checkBookInResponse(session, replyToDestination, 123L, "CXF JMS 
Rocks");
 session.close();
 } finally {
-try {
-if (connection != null) {
-connection.stop();
-connection.close();
-}
-} catch (JMSException ex) {
-// ignore
-}
+close(connection);
 }
 
 }
@@ -247,14 +233,7 @@ public class JAXRSJmsTest extends 
AbstractBusClientServerTestBase {
 checkBookInResponse(session, replyToDestination, 124L, "JMS");
 session.close();
 } finally {
-try {
-if (connection != null) {
-connection.stop();
-connection.close();
-}
-} catch (JMSException ex) {
-// ignore
-}
+close(connection);
 }
 
 }
@@ -276,14 +255,7 @@ public class JAXRSJmsTest extends 
AbstractBusClientServerTestBase {
 checkBookInResponse(session, replyToDestination, 125L, "JMS 
OneWay");
 session.close();
 } finally {
-try {
-if (connection != null) {
-connection.stop();
-connection.close();
-}
-} catch (JMSException ex) {
-// ignore
-}
+close(connection);
 }
 
 }
@@ -385,4 +357,15 @@ public class JAXRSJmsTest extends 
AbstractBusClientServerTestBase {
 return bos.toByteArray();
 }
 
+private void close(Connection connection) {
+try {
+if (connection != null) {
+connection.stop();
+connection.close();
+}
+} catch (JMSException ex) {
+// ignore
+}
+}
+
 }

cxf git commit: Removing some duplicate code

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b3c4e25b8 -> a57148a70


Removing some duplicate code


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

Branch: refs/heads/3.1.x-fixes
Commit: a57148a706ad47b91c5cbf01e863e32b91ad94b7
Parents: b3c4e25
Author: Sergey Beryozkin 
Authored: Fri Apr 28 13:59:25 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 14:02:27 2017 +0100

--
 .../rs/security/oauth2/services/AbstractOAuthService.java   | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a57148a7/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
index 2d041ad..ecca47b 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
@@ -88,14 +88,7 @@ public abstract class AbstractOAuthService {
  */
 protected Client getValidClient(String clientId, MultivaluedMap params)
 throws OAuthServiceException {
-if (clientId != null) {
-mc.put(OAuthConstants.CLIENT_SECRET, 
params.getFirst(OAuthConstants.CLIENT_SECRET));
-mc.put(OAuthConstants.GRANT_TYPE, 
params.getFirst(OAuthConstants.GRANT_TYPE));
-mc.put(OAuthConstants.TOKEN_REQUEST_PARAMS, params);
-return dataProvider.getClient(clientId);
-}
-LOG.fine("No valid client found as the given clientId is null");
-return null;
+return getValidClient(clientId, 
params.getFirst(OAuthConstants.CLIENT_SECRET), params);
 }
 
 protected Client getValidClient(String clientId, String clientSecret, 
MultivaluedMap params)

cxf git commit: Restricting the OAuth2 client auth method when possible

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 1e99be660 -> b3c4e25b8


Restricting the OAuth2 client auth method when possible


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

Branch: refs/heads/3.1.x-fixes
Commit: b3c4e25b8952b64f25fcc2ea1264b95e08e3a717
Parents: 1e99be6
Author: Sergey Beryozkin 
Authored: Fri Apr 28 13:55:12 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 14:01:46 2017 +0100

--
 .../oauth2/client/OAuthClientUtils.java |  1 -
 .../oauth2/services/AbstractOAuthService.java   | 12 ++
 .../oauth2/services/AbstractTokenService.java   | 25 
 .../oauth2/common/OAuthDataProviderImpl.java|  2 ++
 .../security/oauth2/grants/JAXRSOAuth2Test.java | 12 +-
 5 files changed, 45 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b3c4e25b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
index 3f42117..a1467ba 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
@@ -184,7 +184,6 @@ public final class OAuthClientUtils {
  * using the initialized web client 
  * @param accessTokenService the AccessToken client
  * @param grant {@link AccessTokenGrant} grant
- * @param extraParams extra parameters
  * @return {@link ClientAccessToken} access token
  * @throws OAuthServiceException
  */

http://git-wip-us.apache.org/repos/asf/cxf/blob/b3c4e25b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
index a3791f2..2d041ad 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
@@ -98,6 +98,18 @@ public abstract class AbstractOAuthService {
 return null;
 }
 
+protected Client getValidClient(String clientId, String clientSecret, 
MultivaluedMap params)
+throws OAuthServiceException {
+if (clientId != null) {
+mc.put(OAuthConstants.CLIENT_SECRET, clientSecret);
+mc.put(OAuthConstants.GRANT_TYPE, 
params.getFirst(OAuthConstants.GRANT_TYPE));
+mc.put(OAuthConstants.TOKEN_REQUEST_PARAMS, params);
+return dataProvider.getClient(clientId);
+}
+LOG.fine("No valid client found as the given clientId is null");
+return null;
+}
+
 /**
  * HTTPS is the default transport for OAuth 2.0 services.
  * By default this method will issue a warning for open 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b3c4e25b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
index 82e3502..e8df855 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
@@ -62,9 +62,11 @@ public class AbstractTokenService extends 
AbstractOAuthService {
 String clientSecret = 
params.getFirst(OAuthConstants.CLIENT_SECRET);
 if (clientSecret != null) {
 client = getAndValidateClientFromIdAndSecret(clientId, 
clientSecret, params);
+

cxf git commit: Removing some duplicate code

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 514c06899 -> ab25fa963


Removing some duplicate code


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

Branch: refs/heads/master
Commit: ab25fa96335d8f8e7b4e9d896fa006448b953483
Parents: 514c068
Author: Sergey Beryozkin 
Authored: Fri Apr 28 13:59:25 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 13:59:25 2017 +0100

--
 .../rs/security/oauth2/services/AbstractOAuthService.java   | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ab25fa96/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
index 63a9559..10f68a7 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
@@ -88,14 +88,7 @@ public abstract class AbstractOAuthService {
  */
 protected Client getValidClient(String clientId, MultivaluedMap params)
 throws OAuthServiceException {
-if (clientId != null) {
-mc.put(OAuthConstants.CLIENT_SECRET, 
params.getFirst(OAuthConstants.CLIENT_SECRET));
-mc.put(OAuthConstants.GRANT_TYPE, 
params.getFirst(OAuthConstants.GRANT_TYPE));
-mc.put(OAuthConstants.TOKEN_REQUEST_PARAMS, params);
-return dataProvider.getClient(clientId);
-}
-LOG.fine("No valid client found as the given clientId is null");
-return null;
+return getValidClient(clientId, 
params.getFirst(OAuthConstants.CLIENT_SECRET), params);
 }
 
 protected Client getValidClient(String clientId, String clientSecret, 
MultivaluedMap params)

cxf git commit: Retsricting the OAuth2 client auth method when possible

2017-04-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 6c28faf78 -> 514c06899


Retsricting the OAuth2 client auth method when possible


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

Branch: refs/heads/master
Commit: 514c06899fc56b622ec2a1117e857f0d5a8f45a6
Parents: 6c28faf
Author: Sergey Beryozkin 
Authored: Fri Apr 28 13:55:12 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 28 13:55:12 2017 +0100

--
 .../oauth2/client/OAuthClientUtils.java |  3 +--
 .../oauth2/services/AbstractOAuthService.java   | 12 ++
 .../oauth2/services/AbstractTokenService.java   | 25 
 .../oauth2/common/OAuthDataProviderImpl.java|  2 ++
 .../security/oauth2/grants/JAXRSOAuth2Test.java | 12 +-
 5 files changed, 46 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/514c0689/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
index b591041..5a41ebc 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
@@ -184,7 +184,6 @@ public final class OAuthClientUtils {
  * using the initialized web client
  * @param accessTokenService the AccessToken client
  * @param grant {@link AccessTokenGrant} grant
- * @param extraParams extra parameters
  * @return {@link ClientAccessToken} access token
  * @throws OAuthServiceException
  */
@@ -193,7 +192,7 @@ public final class OAuthClientUtils {
 throws OAuthServiceException {
 return getAccessToken(accessTokenService, null, grant, null, false);
 }
-
+
 /**
  * Obtains the access token from OAuth AccessToken Service
  * using the initialized web client

http://git-wip-us.apache.org/repos/asf/cxf/blob/514c0689/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
index f64ce6e..63a9559 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractOAuthService.java
@@ -97,6 +97,18 @@ public abstract class AbstractOAuthService {
 LOG.fine("No valid client found as the given clientId is null");
 return null;
 }
+
+protected Client getValidClient(String clientId, String clientSecret, 
MultivaluedMap params)
+throws OAuthServiceException {
+if (clientId != null) {
+mc.put(OAuthConstants.CLIENT_SECRET, clientSecret);
+mc.put(OAuthConstants.GRANT_TYPE, 
params.getFirst(OAuthConstants.GRANT_TYPE));
+mc.put(OAuthConstants.TOKEN_REQUEST_PARAMS, params);
+return dataProvider.getClient(clientId);
+}
+LOG.fine("No valid client found as the given clientId is null");
+return null;
+}
 
 /**
  * HTTPS is the default transport for OAuth 2.0 services.

http://git-wip-us.apache.org/repos/asf/cxf/blob/514c0689/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
index 826e86d..1657d59 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
@@ -62,9 +62,11 @@

cxf git commit: [CXF-7344] Using double underslash as replacement for dot

2017-04-28 Thread cschneider 
Repository: cxf
Updated Branches:
  refs/heads/master c48c368f4 -> 6c28faf78


[CXF-7344] Using double underslash as replacement for dot


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

Branch: refs/heads/master
Commit: 6c28faf7890b1043a1fd71a74acb5eb482eda006
Parents: c48c368
Author: Christian Schneider 
Authored: Fri Apr 28 14:18:21 2017 +0200
Committer: Christian Schneider 
Committed: Fri Apr 28 14:18:21 2017 +0200

--
 .../cxf/transport/jms/JMSMessageHeadersType.java   | 13 +
 .../apache/cxf/transport/jms/JMSHeaderTypeTest.java|  8 ++--
 2 files changed, 7 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6c28faf7/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
index 1325112..51499ec 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java
@@ -72,15 +72,10 @@ public class JMSMessageHeadersType {
 }
 
 public void putProperty(String key, Object value) {
-String escapedKey = key.replace(".", "_");
-properties.put(escapedKey, value);
+properties.put(key, value);
 }
 
 public Object getProperty(String key) {
-String escapedKey = key.replace(".", "_");
-if (properties.containsKey(escapedKey)) {
-return properties.get(escapedKey);
-}
 return properties.get(key);
 }
 
@@ -375,11 +370,13 @@ public class JMSMessageHeadersType {
 while (enm.hasMoreElements()) {
 String name = enm.nextElement();
 String val = message.getStringProperty(name);
-putProperty(name, val);
+String unescapedName = name.replace("__", ".");
+putProperty(unescapedName, val);
 }
 }
 
-public void writeProp(Message jmsMessage, String name, Object value) 
throws JMSException {
+public void writeProp(Message jmsMessage, String origName, Object value) 
throws JMSException {
+String name = origName.replace(".", "__");
 if (value == null) {
 jmsMessage.setStringProperty(name, null);
 return;

http://git-wip-us.apache.org/repos/asf/cxf/blob/6c28faf7/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
--
diff --git 
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
 
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
index 2e66b28..d92a8b8 100644
--- 
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
+++ 
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
@@ -34,25 +34,21 @@ import static org.junit.Assert.assertEquals;
 public class JMSHeaderTypeTest {
 
 private static final String TEST_VALUE = "test";
-private static final String CONVERTED_RESPONSE_KEY = 
"org_apache_cxf_message_Message_RESPONSE_CODE";
+private static final String CONVERTED_RESPONSE_KEY = 
"org__apache__cxf__message__Message__RESPONSE_CODE";
 
 @Test
 public void testConversionIn() throws JMSException {
 Message message = createMessage();
-
message.setStringProperty(org.apache.cxf.message.Message.RESPONSE_CODE, 
TEST_VALUE);
+message.setStringProperty(CONVERTED_RESPONSE_KEY, TEST_VALUE);
 JMSMessageHeadersType messageHeaders = 
JMSMessageHeadersType.from(message);
 Set keys = messageHeaders.getPropertyKeys();
 Assert.assertEquals(1, keys.size());
-assertEquals(CONVERTED_RESPONSE_KEY, keys.iterator().next());
 assertEquals(TEST_VALUE, 
(String)messageHeaders.getProperty(org.apache.cxf.message.Message.RESPONSE_CODE));
-assertEquals(TEST_VALUE, 
(String)messageHeaders.getProperty(CONVERTED_RESPONSE_KEY));
 }
 
 @Test
 public void testConversionOut() throws JMSException {
 Message message = createMessage();
-
-
message.setStringProperty(org.apache.cxf.message.Message.RESPONSE_CODE, 
TEST_VALUE);
 JMSMessageHeadersType messageHeaders = new JMSMessageHeadersType();