Nexus: Staging Completed

2016-09-14 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDescription:CXF-DOSGi 2.0.0Deployer properties:"userAgent" = "Apache-Maven/3.2.5 (Java 1.8.0_92; Linux 4.4.0-36-generic), Apache-Maven/3.2.5 (Java 1.8.0_92; Linux 4.4.0-36-generic)""userId" = "cschneider""ip" = "149.172.37.189"Details:The following artifacts have been staged/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-parent/2.0.0/cxf-dosgi-samples-rest-parent-2.0.0.pom(SHA1: 6e28edbbc043f6fa3a4f90d77d0706dc6a03267b)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-parent/2.0.0/cxf-dosgi-samples-rest-parent-2.0.0.pom.asc(SHA1: 8107335b59495ab16f46cbe847c10a6de6316f52)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.0.0/cxf-dosgi-samples-soap-api-2.0.0.jar.asc(SHA1: 0cdf2abe0fd81bbe6bb1a9ebc05b8956a00971cb)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.0.0/cxf-dosgi-samples-soap-api-2.0.0.pom(SHA1: b9b851ea0bf90b72ba0a9ba250d2ba23a2782786)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.0.0/cxf-dosgi-samples-soap-api-2.0.0.jar(SHA1: bc842a12ad7c3e78ab02cf448b40d8f4564784ab)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.0.0/cxf-dosgi-samples-soap-api-2.0.0.pom.asc(SHA1: d8499223d7d3e4f34bcf3e3077d080c77758a386)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.0.0/cxf-dosgi-samples-rest-impl-2.0.0.pom(SHA1: 3612aac602e9397b5a896240bca10e3571dda4af)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.0.0/cxf-dosgi-samples-rest-impl-2.0.0.jar.asc(SHA1: 9fb7b12f44d60037da2409c6d047bab2436883a1)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.0.0/cxf-dosgi-samples-rest-impl-2.0.0.jar(SHA1: 3e7c3fd1d5bdd9eab9c39498d4deca27994b16da)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.0.0/cxf-dosgi-samples-rest-impl-2.0.0.pom.asc(SHA1: ce1b46ac09a23b48b9407b3e7323ad2d8d4220c1)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.0.0/cxf-dosgi-samples-security-filter-2.0.0.jar(SHA1: b0d5d93b961c919261a42dd97b6605fa30d6a620)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.0.0/cxf-dosgi-samples-security-filter-2.0.0.jar.asc(SHA1: 065054f30388abe02148ae836a7d76f957ab6e31)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.0.0/cxf-dosgi-samples-security-filter-2.0.0.pom(SHA1: 6feccd5faa0dcd84e273739d174171019514751c)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.0.0/cxf-dosgi-samples-security-filter-2.0.0.pom.asc(SHA1: 54fb1868791ed28e2367686b7a3d5a5c2a892f8d)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-api/2.0.0/cxf-dosgi-samples-rest-api-2.0.0.pom.asc(SHA1: 2d81bb69a6d45f372f423ad1992d0c60d32dff7a)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-api/2.0.0/cxf-dosgi-samples-rest-api-2.0.0.pom(SHA1: e4205ab228b813ce6e8223db0c322d91373cbafd)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-api/2.0.0/cxf-dosgi-samples-rest-api-2.0.0.jar.asc(SHA1: 372b50e229c663a06aead49908bc1e59445832aa)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-api/2.0.0/cxf-dosgi-samples-rest-api-2.0.0.jar(SHA1: 4fe7fadd387a29d429da3a060a50602273e51289)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-client/2.0.0/cxf-dosgi-samples-soap-client-2.0.0.jar.asc(SHA1: 405e0bc7c7c08326f19580225eefe68345893ba1)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-client/2.0.0/cxf-dosgi-samples-soap-client-2.0.0.pom.asc(SHA1: a42dd83fd2d9166eaa48124400ca8e5e25b8e46c)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-client/2.0.0/cxf-dosgi-samples-soap-client-2.0.0.pom(SHA1: e4358c7c540851b86471846ca8120de455aafae0)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-client/2.0.0/cxf-dosgi-samples-soap-client-2.0.0.jar(SHA1: 52e3f0a34795a4f0cc9f6522f97d93fa83463b37)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-impl/2.0.0/cxf-dosgi-samples-soap-impl-2.0.0.pom(SHA1: dfb2d4fda3ddd8116dc4a489748dc770794e046a)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-impl/2.0.0/cxf-dosgi-samples-soap-impl-2.0.0.jar(SHA1: 33fe2284edfe6071e5a28d850b9ae71f22be19e4)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-impl/2.0.0/cxf-dosgi-samples-soap-impl-2.0.0.pom.asc(SHA1: a680a34a90f046099e5a4141f15ba73188535769)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-impl/2.0.0/cxf-dosgi-samples-soap-impl-2.0.0.jar.asc(SHA1: df6146cd0b74ca8474ef9b72bfde209f8b129c6a)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-parent/2.0.0/cxf-dosgi-samples-parent-2.0.0.pom(SHA1: e7e793bfd36093db36592c79398bc138f5f5cff7)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-parent/2.0.0/cxf-dosgi-samples-parent-2.0.0.pom.asc(SHA1: 40897ae4f1995991b40e94043ae92188c7e6fac4)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-parent/2.0.0/cxf-dosgi-samples-soap-parent-2.0.0.pom(SHA1: 86dca2343c56ea897e2179356b45ce12b6fbc7d8)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-parent/2.0.0/cxf-dosgi-samples-soap-parent-2.0.0.pom.asc(SHA1:

[cxf-dosgi] Git Push Summary

2016-09-14 Thread cschneider 
Repository: cxf-dosgi
Updated Tags:  refs/tags/cxf-dosgi-2.0.0 [created] 33493e0ac

cxf-dosgi git commit: [maven-release-plugin] prepare for next development iteration

2016-09-14 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 6813d4c0c -> 869956a94


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/master
Commit: 869956a944b0625364964a96755f810bf4813ecd
Parents: 6813d4c
Author: Christian Schneider 
Authored: Wed Sep 14 15:54:36 2016 +0200
Committer: Christian Schneider 
Committed: Wed Sep 14 15:54:36 2016 +0200

--
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 2 +-
 distribution/pom.xml  | 4 ++--
 distribution/repository/pom.xml   | 2 +-
 distribution/sources/pom.xml  | 4 ++--
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 4 ++--
 parent/pom.xml| 2 +-
 pom.xml   | 4 ++--
 provider-rs/pom.xml   | 2 +-
 provider-ws/pom.xml   | 2 +-
 samples/features/pom.xml  | 2 +-
 samples/pom.xml   | 2 +-
 samples/repository/pom.xml| 2 +-
 samples/rest/api/pom.xml  | 2 +-
 samples/rest/client/pom.xml   | 2 +-
 samples/rest/impl/pom.xml | 2 +-
 samples/rest/pom.xml  | 2 +-
 samples/security_filter/pom.xml   | 2 +-
 samples/soap/api/pom.xml  | 2 +-
 samples/soap/client/pom.xml   | 2 +-
 samples/soap/impl/pom.xml | 2 +-
 samples/soap/pom.xml  | 2 +-
 25 files changed, 29 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/869956a9/common/pom.xml
--
diff --git a/common/pom.xml b/common/pom.xml
index 79f0db1..d994d22 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.0.0
+2.1.0-SNAPSHOT
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/869956a9/decorator/pom.xml
--
diff --git a/decorator/pom.xml b/decorator/pom.xml
index f6b5ec8..5811e9b 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.0.0
+2.1.0-SNAPSHOT
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/869956a9/distribution/features/pom.xml
--
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 648465b..2c5d08e 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.0.0
+2.1.0-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/869956a9/distribution/multi-bundle/pom.xml
--
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index d929bb2..c9663b3 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.0.0
+2.1.0-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/869956a9/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6286f34..d0a52e0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -21,7 +21,7 @@
 4.0.0
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.0.0
+2.1.0-SNAPSHOT
 pom
 CXF DOSGi Distribution Parent
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.0.0
+  2.1.0-SNAPSHOT
   ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/869956a9/distribution/repository/pom.xml
--
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index b9ecae2..1f8def5 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.0.0
+2.1.0-SNAPSHOT
 ../../parent/pom.xml
 
 cxf-dosgi-repository

cxf-dosgi git commit: [maven-release-plugin] prepare release cxf-dosgi-2.0.0

2016-09-14 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master a109b28fa -> 6813d4c0c


[maven-release-plugin] prepare release cxf-dosgi-2.0.0


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

Branch: refs/heads/master
Commit: 6813d4c0c8ae249ef3337757fd272a4e2d4432b6
Parents: a109b28
Author: Christian Schneider 
Authored: Wed Sep 14 15:52:30 2016 +0200
Committer: Christian Schneider 
Committed: Wed Sep 14 15:52:30 2016 +0200

--
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 5 ++---
 distribution/multi-bundle/pom.xml | 2 +-
 distribution/pom.xml  | 4 ++--
 distribution/repository/pom.xml   | 5 ++---
 distribution/sources/pom.xml  | 4 ++--
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 4 ++--
 parent/pom.xml| 5 ++---
 pom.xml   | 4 ++--
 provider-rs/pom.xml   | 2 +-
 provider-ws/pom.xml   | 2 +-
 samples/features/pom.xml  | 5 ++---
 samples/pom.xml   | 2 +-
 samples/repository/pom.xml| 5 ++---
 samples/rest/api/pom.xml  | 2 +-
 samples/rest/client/pom.xml   | 5 ++---
 samples/rest/impl/pom.xml | 5 ++---
 samples/rest/pom.xml  | 5 ++---
 samples/security_filter/pom.xml   | 2 +-
 samples/soap/api/pom.xml  | 2 +-
 samples/soap/client/pom.xml   | 2 +-
 samples/soap/impl/pom.xml | 2 +-
 samples/soap/pom.xml  | 5 ++---
 25 files changed, 38 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/6813d4c0/common/pom.xml
--
diff --git a/common/pom.xml b/common/pom.xml
index 00dd723..79f0db1 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.0-SNAPSHOT
+2.0.0
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/6813d4c0/decorator/pom.xml
--
diff --git a/decorator/pom.xml b/decorator/pom.xml
index 153e05c..f6b5ec8 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.0-SNAPSHOT
+2.0.0
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/6813d4c0/distribution/features/pom.xml
--
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 2446931..648465b 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -9,8 +9,7 @@
 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. -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
 
 4.0.0
 cxf-dosgi
@@ -21,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.0-SNAPSHOT
+2.0.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/6813d4c0/distribution/multi-bundle/pom.xml
--
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index a91c103..d929bb2 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.0-SNAPSHOT
+2.0.0
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/6813d4c0/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 60c09d8..6286f34 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -21,7 +21,7 @@
 4.0.0
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.0-SNAPSHOT
+2.0.0
 pom
 CXF DOSGi Distribution Parent
 http://cxf.apache.org
@@ -29,7

cxf-fediz git commit: Adding OIDC .well-known configuration endpoint for clients to get jwks_uri and other endpoint addresses dynamically

2016-09-14 Thread sergeyb 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 1f46e000e -> 150ca5d8e


Adding OIDC .well-known configuration endpoint for clients to get jwks_uri and 
other endpoint addresses dynamically


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

Branch: refs/heads/master
Commit: 150ca5d8e58f6dbf5c4a7d3291b153298ac3d328
Parents: 1f46e00
Author: Sergey Beryozkin 
Authored: Wed Sep 14 14:37:44 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 14 14:37:44 2016 +0100

--
 .../oidc/src/main/webapp/WEB-INF/applicationContext.xml | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/150ca5d8/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml 
b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index 6091725..eea9aa8 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -225,6 +225,16 @@
 
 
  
- 
+
+  
+ 
+ 
+
+
+
+
+
+
+

cxf-dosgi git commit: [DOSGI-209] Copy SoapBindingConfig intents

2016-09-14 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master b193d0bdb -> a109b28fa


[DOSGI-209] Copy SoapBindingConfig intents


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

Branch: refs/heads/master
Commit: a109b28facacc3f61ec37a84fd1b3a449e20deb6
Parents: b193d0b
Author: Christian Schneider 
Authored: Wed Sep 14 15:35:00 2016 +0200
Committer: Christian Schneider 
Committed: Wed Sep 14 15:35:00 2016 +0200

--
 .../cxf/dosgi/dsw/handlers/ws/WsProvider.java   | 22 +++-
 1 file changed, 21 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/a109b28f/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
--
diff --git 
a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
 
b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
index bd1b541..3958c8b 100644
--- 
a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
+++ 
b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
@@ -127,12 +127,32 @@ public class WsProvider implements DistributionProvider {
 if (dataBinding != null) {
 factory.setDataBinding(dataBinding);
 }
-BindingConfiguration binding = 
intentManager.getIntent(BindingConfiguration.class, intents);
+BindingConfiguration binding = 
copy(intentManager.getIntent(BindingConfiguration.class, intents));
+
 if (binding != null) {
 factory.setBindingConfig(binding);
 }
 }
 
+private BindingConfiguration copy(BindingConfiguration bindingCfg) {
+return bindingCfg instanceof SoapBindingConfiguration 
+? copy((SoapBindingConfiguration)bindingCfg) : bindingCfg;
+}
+
+private SoapBindingConfiguration copy(SoapBindingConfiguration intent) {
+SoapBindingConfiguration bindingCfg = new SoapBindingConfiguration();
+bindingCfg.setVersion(intent.getVersion());
+bindingCfg.setTransportURI(intent.getTransportURI());
+bindingCfg.setUse(intent.getUse());
+if (intent.isSetStyle()) {
+bindingCfg.setStyle(intent.getStyle());
+}
+bindingCfg.setMtomEnabled(intent.isMtomEnabled());
+bindingCfg.setBindingName(intent.getBindingName());
+bindingCfg.setBindingNamePostfix(intent.getBindingNamePostfix());
+return bindingCfg;
+}
+
 @SuppressWarnings("rawtypes")
 public Endpoint exportService(Object serviceO,
   BundleContext serviceContext,

cxf git commit: Using UriBuilder to deal with duplicate forward slashes

2016-09-14 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 5072be969 -> 4aa035327


Using UriBuilder to deal with duplicate forward slashes


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

Branch: refs/heads/3.1.x-fixes
Commit: 4aa03532795379b702249e881a3bf027062a797c
Parents: 5072be9
Author: Sergey Beryozkin 
Authored: Wed Sep 14 14:26:52 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 14 14:27:53 2016 +0100

--
 .../apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java| 2 ++
 .../rs/security/oauth2/services/AuthorizationMetadataService.java | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4aa03532/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
--
diff --git 
a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
 
b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
index d1fb1f5..030548f 100644
--- 
a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
+++ 
b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
@@ -71,12 +71,14 @@ public class JsonMapObjectReaderWriter {
 
 protected void toJsonInternal(Output out, Map map) {
 out.append("{");
+formatIfNeeded(out);
 for (Iterator> it = 
map.entrySet().iterator(); it.hasNext();) {
 Map.Entry entry = it.next();
 out.append("\"").append(entry.getKey()).append("\"");
 out.append(":");
 toJsonInternal(out, entry.getValue(), it.hasNext());
 }
+formatIfNeeded(out);
 out.append("}");
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4aa03532/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
index 97c7a53..7e7d05b 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
@@ -25,6 +25,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
@@ -76,7 +77,7 @@ public class AuthorizationMetadataService {
 if (endpointAddress.startsWith("https")) {
 return endpointAddress;
 } else {
-return baseUri + endpointAddress; 
+return 
UriBuilder.fromUri(baseUri).path(endpointAddress).build().toString(); 
 }
 }

cxf git commit: Using UriBuilder to deal with duplicate forward slashes

2016-09-14 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 5eb67e159 -> 9810a8448


Using UriBuilder to deal with duplicate forward slashes


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

Branch: refs/heads/master
Commit: 9810a844802659199015755027eb51db37afad2b
Parents: 5eb67e1
Author: Sergey Beryozkin 
Authored: Wed Sep 14 14:26:52 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 14 14:26:52 2016 +0100

--
 .../apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java| 2 ++
 .../rs/security/oauth2/services/AuthorizationMetadataService.java | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9810a844/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
--
diff --git 
a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
 
b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
index d1fb1f5..030548f 100644
--- 
a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
+++ 
b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
@@ -71,12 +71,14 @@ public class JsonMapObjectReaderWriter {
 
 protected void toJsonInternal(Output out, Map map) {
 out.append("{");
+formatIfNeeded(out);
 for (Iterator> it = 
map.entrySet().iterator(); it.hasNext();) {
 Map.Entry entry = it.next();
 out.append("\"").append(entry.getKey()).append("\"");
 out.append(":");
 toJsonInternal(out, entry.getValue(), it.hasNext());
 }
+formatIfNeeded(out);
 out.append("}");
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9810a844/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
index 97c7a53..7e7d05b 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
@@ -25,6 +25,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
@@ -76,7 +77,7 @@ public class AuthorizationMetadataService {
 if (endpointAddress.startsWith("https")) {
 return endpointAddress;
 } else {
-return baseUri + endpointAddress; 
+return 
UriBuilder.fromUri(baseUri).path(endpointAddress).build().toString(); 
 }
 }

cxf git commit: Fixing a typo in the OAuth2 config service

2016-09-14 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2624d5dd7 -> 5072be969


Fixing a typo in the OAuth2 config service


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

Branch: refs/heads/3.1.x-fixes
Commit: 5072be96989b8617cb4fcf88ecad69fa324349c7
Parents: 2624d5d
Author: Sergey Beryozkin 
Authored: Wed Sep 14 13:52:31 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 14 13:53:15 2016 +0100

--
 .../rs/security/oauth2/services/AuthorizationMetadataService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5072be96/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
index cfd566b..97c7a53 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
@@ -46,6 +46,7 @@ public class AuthorizationMetadataService {
 prepareConfigurationData(cfg, baseUri);
 
 JsonMapObjectReaderWriter writer = new JsonMapObjectReaderWriter();
+writer.setFormat(true);
 return writer.toJson(cfg);
 }
 
@@ -71,7 +72,7 @@ public class AuthorizationMetadataService {
 }
 
 protected static String calculateEndpointAddress(String endpointAddress, 
String baseUri, String defRelAddress) {
-endpointAddress = endpointAddress == null ? endpointAddress : 
defRelAddress;
+endpointAddress = endpointAddress != null ? endpointAddress : 
defRelAddress;
 if (endpointAddress.startsWith("https")) {
 return endpointAddress;
 } else {

cxf git commit: Fixing a typo in the OAuth2 config service

2016-09-14 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master f7f017f21 -> 5eb67e159


Fixing a typo in the OAuth2 config service


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

Branch: refs/heads/master
Commit: 5eb67e15938ece67e7a0f518d05b1ff653690f0f
Parents: f7f017f
Author: Sergey Beryozkin 
Authored: Wed Sep 14 13:52:31 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 14 13:52:31 2016 +0100

--
 .../rs/security/oauth2/services/AuthorizationMetadataService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5eb67e15/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
index cfd566b..97c7a53 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
@@ -46,6 +46,7 @@ public class AuthorizationMetadataService {
 prepareConfigurationData(cfg, baseUri);
 
 JsonMapObjectReaderWriter writer = new JsonMapObjectReaderWriter();
+writer.setFormat(true);
 return writer.toJson(cfg);
 }
 
@@ -71,7 +72,7 @@ public class AuthorizationMetadataService {
 }
 
 protected static String calculateEndpointAddress(String endpointAddress, 
String baseUri, String defRelAddress) {
-endpointAddress = endpointAddress == null ? endpointAddress : 
defRelAddress;
+endpointAddress = endpointAddress != null ? endpointAddress : 
defRelAddress;
 if (endpointAddress.startsWith("https")) {
 return endpointAddress;
 } else {

svn commit: r997379 - in /websites/production/cxf/content: cache/main.pageCache distributed-osgi-reference.html

2016-09-14 Thread buildbot 
Author: buildbot
Date: Wed Sep 14 12:47:39 2016
New Revision: 997379

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/main.pageCache
websites/production/cxf/content/distributed-osgi-reference.html

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

Modified: websites/production/cxf/content/distributed-osgi-reference.html
==
--- websites/production/cxf/content/distributed-osgi-reference.html (original)
+++ websites/production/cxf/content/distributed-osgi-reference.html Wed Sep 14 
12:47:39 2016
@@ -110,17 +110,17 @@ Apache CXF -- Distributed OSGi Reference


 Distributed OSGi 
Reference Guide/**/
+/*]]>*/
 Distributed OSGi 
Reference Guide
 Configuration 
Properties
 Service
 Provider properties For Configuring SOAP-based services and 
consumersService
 Provider properties For Configuring RESTful JAXRS-based endpoints and 
consumersService Consumer 
properties
 Custom 
intentsremote-services.xml 
filesContributing
 Distribution properties to Existing Services (without changing 
them)
 
-Configuration 
PropertiesNew in DOSGI 1.2: Servlet Filters 
(javax.servlet.Filter) can be registered as OSGi services with the 
"org.apache.cxf.httpservice.filter" boolean property set to 
true and used to secure DOSGi server endpoints.Endpoints can enforce the 
registration of the filters by setting an 
"org.apache.cxf.httpservice.requirefilter" boolean property to 
true.These properties are set on the Service Registration in the OSGi 
Service Registry.Service
 Provider properties For Configuring SOAP-based services and 
consumersNote: for backwards compatibility old values 
marked below are still supported.Property NameData TypeExampleDescriptionservice.exported.interfaces (previously:osgi.remote.interfaces)Stringorg.example.BarService,org.example.FooService
 *Denotes the interfaces to be exposed remotely. This is 
a comma-separated list of fully qualified Java interfaces that should be made 
available remotely. A special value of * can be provided meaning 
that all of the interfaces passed to the 
BundleContext.registerService() call are suitable for 
remoting.service.exported.configs 
(previously:osgi.remote.configuration.type)Stringorg.apache.cxf.wsSpecifies the mechanism for configuring the 
service exposure. Possible values:org.apache.cxf.ws 
(previously: pojo) the OSGi Service is exposed as a Web 
Service.wsdl configuration driven from 
WSDLorg.apache.cxf.ws
 configuration typeWhen the 
service.exported.configs=org.apache.cxf.ws (or 
osgi.remote.configuration.type=pojo) property is specified, the 
following properties may also be specified.
 Property 
NameData 
TypeExampleDescriptionorg.apache.cxf.ws.address 
(previously:osgi.remote.configuration.pojo.address)Stringhttp://localhost:9090/greeter; 
rel="nofollow">http://localhost:9090/greeterThe address at which the service with be 
made available remotely. If this property is not specified, this defaults to http://localhost:9000/fully/qualified/ClassName; rel="nofollow">http://
 localhost:9000/fully/qualified/ClassName.org.apache.cxf.ws.httpservice.context 
(previously:osgi.remote.configuration.pojo.httpservice.context)String/auctionWhen this 
property is specified, the OSGi HTTP Service is used to expose the service, 
rather than a dedicated Jetty HTTP Server. This property doesn't allow the 
specification of a port number, as this is provided by the HTTP Service. The 
Distributed OSGi distributions come with Pax-Web, for which configuration 
information can be found at http://wiki.ops4j.org/display/paxweb/Configuration; 
rel="nofollow">http://wiki.ops4j.org/display/paxweb/Configuration, however 
other OSGi HTTP 
 Service implementations are potentially configured 
differently.org.apache.cxf.ws.frontendStringjaxwsThe CXF frontend which will be used to create 
endpoints. Defaults to 'simple' which is an Aegis-based simple frontend. Note 
that for JAXWS to work a javax.jws.* has to be imported into the interface 
and/or implementation and client bundles for annotations like @WebService and 
@WebMethod be recognizedorg.apache.cxf.ws.databindingStringjaxbSupported values are 'aeg
 is and 'jaxb', defaults to 'aegis'. Note that for JAXB to work JAXB packages 
like javax.xml.bind.annotation.* have to be importedorg.apache.cxf.ws.databinding.beanDataBindingAn actual DataBinding instance to use. If not specified, a 
default one is created according to

cxf-fediz git commit: Adding OIDC access token revocation service

2016-09-14 Thread sergeyb 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 510bee5ad -> 1f46e000e


Adding OIDC access token revocation service


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

Branch: refs/heads/master
Commit: 1f46e000ed93cd8362df4f4538a092e6322461f4
Parents: 510bee5
Author: Sergey Beryozkin 
Authored: Wed Sep 14 12:58:01 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 14 12:58:01 2016 +0100

--
 services/oidc/src/main/webapp/WEB-INF/applicationContext.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1f46e000/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml 
b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index 53bd83f..6091725 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -201,6 +201,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -211,6 +215,7 @@
 
 
 
+

cxf-fediz git commit: [FEDIZ-173] Cors support for js OIDC Implicit Flow, patch from Adrian Gonzalez applied, This closes #9

2016-09-14 Thread sergeyb 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 22553ad77 -> 510bee5ad


[FEDIZ-173] Cors support for js OIDC Implicit Flow, patch from Adrian Gonzalez 
applied, This closes #9


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

Branch: refs/heads/master
Commit: 510bee5adc9d1742cd942f93db2a07abc82084b5
Parents: 22553ad
Author: Sergey Beryozkin 
Authored: Wed Sep 14 12:06:29 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 14 12:06:29 2016 +0100

--
 services/oidc/pom.xml   | 5 +
 .../oidc/src/main/webapp/WEB-INF/applicationContext.xml | 9 +
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/510bee5a/services/oidc/pom.xml
--
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index ad3b515..aede1dd 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -58,6 +58,11 @@
 ${cxf.version}
 
 
+org.apache.cxf
+cxf-rt-rs-security-cors
+${cxf.version}
+
+
 org.springframework
 spring-web
 ${spring.version}

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/510bee5a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml 
b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index c893dd4..53bd83f 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -95,6 +95,7 @@

 
 
+
 
 
 
@@ -119,6 +120,7 @@

 
 
+
 
 
 
@@ -178,6 +180,13 @@
 
   -->
 
+
+
+Authorization
+
+
+
+

cxf-fediz git commit: [FEDIZ-174] Updating to CXF 3.1.8-SNAPSHOT

2016-09-14 Thread sergeyb 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 60fd1e8d0 -> 22553ad77


[FEDIZ-174] Updating to CXF 3.1.8-SNAPSHOT


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

Branch: refs/heads/master
Commit: 22553ad770a315ad0eef7c400df14d739ceb920d
Parents: 60fd1e8
Author: Sergey Beryozkin 
Authored: Wed Sep 14 11:41:23 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 14 11:41:23 2016 +0100

--
 pom.xml | 2 +-
 services/idp/pom.xml| 5 -
 services/idp/src/main/resources/restContext.xml | 8 +---
 3 files changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/22553ad7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index beea523..2a07571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 1.2
 2.5
 1.5.1
-3.1.7
+3.1.8-SNAPSHOT
 3.2.0
 3.4
 4.5.1

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/22553ad7/services/idp/pom.xml
--
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index f7f8824..b7e918f 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -259,11 +259,6 @@
 
 
 
-io.swagger
-swagger-jaxrs
-1.5.6
-
-
 commons-validator
 commons-validator
 ${commons.validator.version}

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/22553ad7/services/idp/src/main/resources/restContext.xml
--
diff --git a/services/idp/src/main/resources/restContext.xml 
b/services/idp/src/main/resources/restContext.xml
index 6e3aaaf..1d6f446 100644
--- a/services/idp/src/main/resources/restContext.xml
+++ b/services/idp/src/main/resources/restContext.xml
@@ -55,7 +55,10 @@
 
 
 
- 
+
+
+
+ 
 
 
 
@@ -65,8 +68,7 @@
 
 
 
-
-
+

cxf-dosgi git commit: [DOSGI-108] Throw exception if a service has multiple interfaces

2016-09-14 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 8ff43bef6 -> b193d0bdb


[DOSGI-108] Throw exception if a service has multiple interfaces


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

Branch: refs/heads/master
Commit: b193d0bdb4e6b1fa9e1155b16eae091ac9168e4f
Parents: 8ff43be
Author: Christian Schneider 
Authored: Wed Sep 14 11:34:56 2016 +0200
Committer: Christian Schneider 
Committed: Wed Sep 14 11:34:56 2016 +0200

--
 .../java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java   | 3 +++
 .../java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java | 3 +++
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/b193d0bd/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
--
diff --git 
a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
 
b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
index b618050..66f6ff1 100644
--- 
a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
+++ 
b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
@@ -90,6 +90,9 @@ public class RsProvider implements DistributionProvider {
  BundleContext consumerContext,
  Class[] interfaces,
  EndpointDescription endpoint) {
+if (interfaces.length > 1) {
+throw new IllegalArgumentException("Multiple interfaces are not 
supported by this provider");
+}
 Set intentNames = 
intentManager.getImported(endpoint.getProperties());
 List intents = intentManager.getRequiredIntents(intentNames);
 Class iClass = interfaces[0];

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/b193d0bd/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
--
diff --git 
a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
 
b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
index 3bc28ee..bd1b541 100644
--- 
a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
+++ 
b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
@@ -95,6 +95,9 @@ public class WsProvider implements DistributionProvider {
  BundleContext consumerContext,
  Class[] interfaces,
  EndpointDescription endpoint) throws 
IntentUnsatisfiedException {
+if (interfaces.length > 1) {
+throw new IllegalArgumentException("Multiple interfaces are not 
supported by this provider");
+}
 Class iClass = interfaces[0];
 Map sd = endpoint.getProperties();
 String address = getClientAddress(sd);

cxf-dosgi git commit: Make sure we do not use any snapshot dependencies

2016-09-14 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master b15c66ffe -> 8ff43bef6


Make sure we do not use any snapshot dependencies


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

Branch: refs/heads/master
Commit: 8ff43bef6281a7a08a03368cf5a67c9c444adee6
Parents: b15c66f
Author: Christian Schneider 
Authored: Wed Sep 14 11:19:34 2016 +0200
Committer: Christian Schneider 
Committed: Wed Sep 14 11:19:34 2016 +0200

--
 distribution/repository/pom.xml |  9 -
 parent/pom.xml  |  2 +-
 samples/repository/pom.xml  | 35 ++-
 samples/rest/README.md  |  4 ++--
 samples/soap/README.md  |  6 +++---
 samples/soap/soap.bndrun| 23 ---
 samples/ssl/README.md   | 10 +++---
 7 files changed, 63 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/distribution/repository/pom.xml
--
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index f70d989..5050920 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -14,9 +14,16 @@
 
 org.apache.aries.rsa
 repository
-1.10-SNAPSHOT
+${aries.rsa.version}
 pom
 
+
+
+
+org.fusesource.jansi
+jansi
+1.13
+
 
 org.ow2.asm
 asm-all

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e5fc564..0ce1d33 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
 
 5.0.0
 5.0.0
-1.10-SNAPSHOT
+1.9.0
 3.1.7
 5.4.0
 3.4.8

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/samples/repository/pom.xml
--
diff --git a/samples/repository/pom.xml b/samples/repository/pom.xml
index 2c7fdb7..a29e5e1 100644
--- a/samples/repository/pom.xml
+++ b/samples/repository/pom.xml
@@ -43,6 +43,7 @@
 org.apache.felix.fileinstall
 3.5.2
 
+
+
+org.apache.felix
+org.apache.felix.gogo.command
+0.16.0
+
+
+org.osgi.core
+org.osgi
+
+
+org.osgi.compendium
+org.osgi
+
+
+
+org.apache.felix.bundlerepository
+
+org.apache.felix
+
+
+
+
+org.apache.felix
+org.apache.felix.gogo.runtime
+0.10.0
+
+
+org.apache.felix
+org.apache.felix.gogo.shell
+0.12.0
+
 
 org.apache.felix
 org.apache.felix.scr
-2.0.2
+2.0.4
 
 
 animal-sniffer-annotations

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/samples/rest/README.md
--
diff --git a/samples/rest/README.md b/samples/rest/README.md
index 0c74070..e46b2e4 100644
--- a/samples/rest/README.md
+++ b/samples/rest/README.md
@@ -16,7 +16,7 @@ Unpack karaf 4 into a server and client directory.
 Start the server karaf
 
 ```
-feature:repo-add cxf-dosgi-samples 2.0-SNAPSHOT
+feature:repo-add cxf-dosgi-samples 2.0.0
 feature:install cxf-dosgi-sample-rest-impl
 rsa:endpoints
 ```
@@ -28,7 +28,7 @@ The last command should show one endpoint with a URI as id. 
You should be able t
 Start the client karaf
 
 ```
-feature:repo-add cxf-dosgi-samples 2.0-SNAPSHOT
+feature:repo-add cxf-dosgi-samples 2.0.0
 feature:install cxf-dosgi-sample-rest-client
 ```
 Use commands to test

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/samples/soap/README.md
--
diff --git a/samples/soap/README.md b/samples/soap/README.md
index 638b3cb..95bde9c 100644
--- a/samples/soap/README.md
+++ b/samples/soap/README.md
@@ -17,7 +17,7 @@ Unpack karaf 4 into a server and client directory.
 Start the server karaf
 
 ```