[cxf-dosgi] branch master updated: DOSGI-27801 - Upgrade to rsa 1.12 and other upgrades

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 2b8eb35  DOSGI-27801 - Upgrade to rsa 1.12 and other upgrades
2b8eb35 is described below

commit 2b8eb35a783274d85984f3f7987f5e4f1b066e92
Author: Christian Schneider 
AuthorDate: Mon Jul 2 14:56:30 2018 +0200

DOSGI-27801 - Upgrade to rsa 1.12 and other upgrades
---
 distribution/multi-bundle/distro.bndrun| 49 ++
 distribution/multi-bundle/pom.xml  | 42 ---
 .../cxf/dosgi/itests/multi/AbstractDosgiTest.java  |  2 +
 .../cxf/dosgi/itests/multi/MultiBundleTools.java   | 10 -
 .../cxf/dosgi/itests/multi/TestExportService.java  |  2 +-
 parent/pom.xml | 23 --
 6 files changed, 51 insertions(+), 77 deletions(-)

diff --git a/distribution/multi-bundle/distro.bndrun 
b/distribution/multi-bundle/distro.bndrun
index e4baa88..2475f42 100644
--- a/distribution/multi-bundle/distro.bndrun
+++ b/distribution/multi-bundle/distro.bndrun
@@ -48,20 +48,10 @@
javax.annotation-api;version='[1.3.0,1.3.1)',\
javax.servlet-api;version='[3.1.0,3.1.1)',\
javax.validation.api;version='[1.1.0,1.1.1)',\
-   org.apache.aries.rsa.core;version='[1.11.0,1.11.1)',\
-   org.apache.aries.rsa.discovery.command;version='[1.11.0,1.11.1)',\
-   org.apache.aries.rsa.discovery.local;version='[1.11.0,1.11.1)',\
-   org.apache.aries.rsa.discovery.zookeeper;version='[1.11.0,1.11.1)',\
-   org.apache.aries.rsa.spi;version='[1.11.0,1.11.1)',\
-   org.apache.aries.rsa.topology-manager;version='[1.11.0,1.11.1)',\
org.apache.commons.lang3;version='[3.7.0,3.7.1)',\
-   org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\
org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
org.apache.felix.eventadmin;version='[1.4.6,1.4.7)',\
org.apache.felix.fileinstall;version='[3.5.2,3.5.3)',\
-   org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\
-   org.apache.felix.gogo.jline;version='[1.0.6,1.0.7)',\
-   org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\
org.apache.felix.http.api;version='[2.3.2,2.3.3)',\
org.apache.felix.http.jetty;version='[3.0.0,3.0.1)',\
org.apache.felix.metatype;version='[1.1.2,1.1.3)',\
@@ -70,9 +60,7 @@
org.apache.servicemix.bundles.reflections;version='[0.9.10,0.9.11)',\
org.apache.servicemix.bundles.wsdl4j;version='[1.6.3,1.6.4)',\
org.apache.servicemix.specs.jaxrs-api-2.1;version='[2.9.1,2.9.2)',\
-   org.apache.ws.xmlschema.core;version='[2.2.2,2.2.3)',\
org.fusesource.jansi;version='[1.13.0,1.13.1)',\
-   org.jline;version='[3.3.1,3.3.2)',\
org.objectweb.asm.all;version='[5.0.4,5.0.5)',\
org.ops4j.pax.logging.pax-logging-api;version='[1.8.5,1.8.6)',\
org.ops4j.pax.logging.pax-logging-service;version='[1.8.5,1.8.6)',\
@@ -82,20 +70,29 @@
com.fasterxml.jackson.core.jackson-annotations;version='[2.9.0,2.9.1)',\
com.fasterxml.jackson.core.jackson-core;version='[2.9.1,2.9.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.9.1,2.9.2)',\
-   org.apache.cxf.cxf-core;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-bindings-soap;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-bindings-xml;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-databinding-aegis;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-databinding-jaxb;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-frontend-jaxws;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-frontend-simple;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-rs-client;version='[3.2.2,3.2.3)',\
-   
org.apache.cxf.cxf-rt-rs-service-description-swagger;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-transports-http;version='[3.2.2,3.2.3)',\
-   org.apache.cxf.cxf-rt-wsdl;version='[3.2.2,3.2.3)',\
org.apache.cxf.dosgi.cxf-dosgi-common;version='[2.4.0,2.4.1)',\
org.apache.cxf.dosgi.cxf-dosgi-provider-rs;version='[2.4.0,2.4.1)',\
org.apache.cxf.dosgi.cxf-dosgi-provider-ws;version='[2.4.0,2.4.1)',\
-   
org.apache.cxf.dosgi.samples.cxf-dosgi-samples-rest-api;version='[2.4.0,2.4.1)',\
-   
org.apache.cxf.dosgi.samples.cxf-dosgi-samples-rest-impl;version='[2.4.0,2.4.1)'
+   org.apache.aries.rsa.core;version='[1.12.0,1.12.1)',\
+   org.apache.aries.rsa.discovery.command;version='[1.12.0,1.12.1)',\
+   org.apache.aries.rsa.discovery.local;version='[1.12.0,1.12.1)',\
+   org.apache.aries.rsa.discovery.zookeeper;version='[1.12.0,1.12.1)',\
+   org.apache.aries.rsa.spi;version='[1.12.0,1.12.1

[cxf] branch master updated: [CXF-7023] Add oneSessionPerConnection property to JMS transport

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 144ff8c  [CXF-7023] Add oneSessionPerConnection property to JMS 
transport
144ff8c is described below

commit 144ff8c9fa7a4495ad4825ba47cef74af563a299
Author: Simon Marti <simon.ma...@inventage.com>
AuthorDate: Thu Dec 14 14:44:07 2017 +0100

[CXF-7023] Add oneSessionPerConnection property to JMS transport
---
 .../cxf/transport/jms/BackChannelConduit.java  | 20 +-
 .../org/apache/cxf/transport/jms/JMSConduit.java   | 41 +---
 .../apache/cxf/transport/jms/JMSConfigFactory.java |  2 +
 .../apache/cxf/transport/jms/JMSConfiguration.java |  9 +++
 .../apache/cxf/transport/jms/JMSDestination.java   | 46 +-
 .../apache/cxf/transport/jms/uri/JMSEndpoint.java  | 13 
 .../jms/util/PollingMessageListenerContainer.java  | 74 --
 .../jms/testsuite/testcases/SoapJmsSpecTest.java   |  2 +-
 8 files changed, 174 insertions(+), 33 deletions(-)

diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/BackChannelConduit.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/BackChannelConduit.java
index a83984b..5a95501 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/BackChannelConduit.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/BackChannelConduit.java
@@ -54,14 +54,19 @@ class BackChannelConduit extends AbstractConduit implements 
JMSExchangeSender {
 private static final Logger LOG = 
LogUtils.getL7dLogger(BackChannelConduit.class);
 private JMSConfiguration jmsConfig;
 private Message inMessage;
-private Connection connection;
+private Connection persistentConnection;
 
 BackChannelConduit(Message inMessage, JMSConfiguration jmsConfig, 
Connection connection) {
 super(EndpointReferenceUtils.getAnonymousEndpointReference());
 this.inMessage = inMessage;
 this.jmsConfig = jmsConfig;
-this.connection = connection;
+this.persistentConnection = connection;
 }
+
+BackChannelConduit(Message inMessage, JMSConfiguration jmsConfig) {
+this(inMessage, jmsConfig, null);
+}
+
 @Override
 public void close(Message msg) throws IOException {
 MessageStreamUtil.closeStreams(msg);
@@ -121,6 +126,14 @@ class BackChannelConduit extends AbstractConduit 
implements JMSExchangeSender {
 
 private void send(final Message outMessage, final Object replyObj, 
ResourceCloser closer)
 throws JMSException {
+Connection connection;
+
+if (persistentConnection == null) {
+connection = 
closer.register(JMSFactory.createConnection(jmsConfig));
+} else {
+connection = this.persistentConnection;
+}
+
 Session session = closer.register(connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE));
 
 JMSMessageHeadersType outProps = 
(JMSMessageHeadersType)outMessage.get(JMS_SERVER_RESPONSE_HEADERS);
@@ -178,6 +191,7 @@ class BackChannelConduit extends AbstractConduit implements 
JMSExchangeSender {
 
messageProperties.setJMSDeliveryMode(inMessageProperties.getJMSDeliveryMode());
 messageProperties.setJMSPriority(inMessageProperties.getJMSPriority());
 
messageProperties.setSOAPJMSRequestURI(inMessageProperties.getSOAPJMSRequestURI());
+
messageProperties.setSOAPJMSSOAPAction(inMessageProperties.getSOAPJMSSOAPAction());
 messageProperties.setSOAPJMSBindingVersion("1.0");
 }
 
@@ -220,4 +234,4 @@ class BackChannelConduit extends AbstractConduit implements 
JMSExchangeSender {
 : request.getJMSCorrelationID();
 }
 
-}
\ No newline at end of file
+}
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
index 50db27d..d627c16 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
@@ -47,10 +47,12 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.security.SecurityContext;
 import org.apache.cxf.transport.AbstractConduit;
+import org.apache.cxf.transport.jms.util.AbstractMessageListenerContainer;
 import org.apache.cxf.transport.jms.util.JMSListenerContainer;
 import org.apache.cxf.transport.jms.util.JMSSender;
 import org.apache.cxf.transport.jms.util.JMSUtil;
 import org.apache.cxf.transport.jms.util.MessageListenerContainer;
+import org.apache.cxf.transport.jms.util.PollingMessageListenerContainer;
 import org.apache.cxf.transport.jms.util.ResourceCloser;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 
@

[cxf-dosgi] branch master updated: [maven-release-plugin] prepare for next development iteration

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new e32dde4  [maven-release-plugin] prepare for next development iteration
e32dde4 is described below

commit e32dde4138e17029563ab56c84b0d73e2b007d0e
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 10:33:10 2017 +0200

[maven-release-plugin] prepare for next development iteration
---
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 2 +-
 distribution/pom.xml  | 2 +-
 distribution/repository/pom.xml   | 2 +-
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 2 +-
 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-jackson/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 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index d6f2ba5..a19d2ce 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../parent/pom.xml
 
 
diff --git a/decorator/pom.xml b/decorator/pom.xml
index f780779..df06733 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../parent/pom.xml
 
 
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 7f21c6c..ea5bc19 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../pom.xml
 
 
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 7fd4ce5..71eb49f 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -19,7 +19,7 @@

org.apache.cxf.dosgi
cxf-dosgi-distribution-parent
-   2.3.0
+   2.4.0-SNAPSHOT
../pom.xml

 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 51fd110..bc50859 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.3.0
+  2.4.0-SNAPSHOT
   ../parent/pom.xml
 
 
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index 4c1d67b..f3cc289 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../../parent/pom.xml
 
 cxf-dosgi-repository
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 8ecaa7b..a0c4d5b 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../../parent/pom.xml
 
 
diff --git a/itests/pom.xml b/itests/pom.xml
index 0d9ee41..3a89ed2 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../parent/pom.xml
 
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e57b05..15d12e0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -14,7 +14,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.3.0
+2.4.0-SNAPSHOT
 
 
 4.0.0
diff --git a/pom.xml b/pom.xml
index ddacffa..d1c3854 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.3.0
+2.4.0-SNAPSHOT
 
 pom
 CXF DOSGi main
@@ -37,7 +37,7 @@
 
scm:git:http://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
scm:git:https://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
https://gitbox.apache.org/repos/asf?p=cxf-dosgi.git;a=s

[cxf-dosgi] annotated tag cxf-dosgi-2.3.0 created (now ce7eedb)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to annotated tag cxf-dosgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


  at ce7eedb  (tag)
 tagging 87223d10fe189605a796629530583d01866bec27 (commit)
 replaces cxf-dosgi-2.2.0
  by Christian Schneider
  on Sat Sep 23 10:33:01 2017 +0200

- Log -
[maven-release-plugin] copy for tag cxf-dosgi-2.3.0
---

No new revisions were added by this update.

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

[cxf-dosgi] branch master updated: [maven-release-plugin] prepare release cxf-dosgi-2.3.0

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 87223d1  [maven-release-plugin] prepare release cxf-dosgi-2.3.0
87223d1 is described below

commit 87223d10fe189605a796629530583d01866bec27
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 10:32:39 2017 +0200

[maven-release-plugin] prepare release cxf-dosgi-2.3.0
---
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 2 +-
 distribution/pom.xml  | 2 +-
 distribution/repository/pom.xml   | 2 +-
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 2 +-
 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-jackson/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 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index a19d2ce..d6f2ba5 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../parent/pom.xml
 
 
diff --git a/decorator/pom.xml b/decorator/pom.xml
index df06733..f780779 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../parent/pom.xml
 
 
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index ea5bc19..7f21c6c 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../pom.xml
 
 
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 71eb49f..7fd4ce5 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -19,7 +19,7 @@

org.apache.cxf.dosgi
cxf-dosgi-distribution-parent
-   2.4.0-SNAPSHOT
+   2.3.0
../pom.xml

 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index bc50859..51fd110 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.4.0-SNAPSHOT
+  2.3.0
   ../parent/pom.xml
 
 
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index f3cc289..4c1d67b 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../../parent/pom.xml
 
 cxf-dosgi-repository
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index a0c4d5b..8ecaa7b 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../../parent/pom.xml
 
 
diff --git a/itests/pom.xml b/itests/pom.xml
index 3a89ed2..0d9ee41 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../parent/pom.xml
 
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 15d12e0..8e57b05 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -14,7 +14,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.4.0-SNAPSHOT
+2.3.0
 
 
 4.0.0
diff --git a/pom.xml b/pom.xml
index d1c3854..ddacffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.4.0-SNAPSHOT
+2.3.0
 
 pom
 CXF DOSGi main
@@ -37,7 +37,7 @@
 
scm:git:http://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
scm:git:https://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
https://gitbox.apache.org/repos/asf?p=cxf-dosgi.git;a=summary
-  

[cxf-dosgi] annotated tag cxf-dosgi-2.3.0 deleted (was 161c3d9)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to annotated tag cxf-dosgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


*** WARNING: tag cxf-dosgi-2.3.0 was deleted! ***

   tag was  161c3d9

The revisions that were on this annotated tag are still contained in
other references; therefore, this change does not discard any commits
from the repository.

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

[cxf-dosgi] 01/03: Use markdown in readme

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit 57caa5e89c1d0afc61c82ad8517083bd472286e0
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 10:12:42 2017 +0200

Use markdown in readme
---
 distribution/multi-bundle/src/main/release/{README => README.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/distribution/multi-bundle/src/main/release/README 
b/distribution/multi-bundle/src/main/release/README.md
similarity index 100%
rename from distribution/multi-bundle/src/main/release/README
rename to distribution/multi-bundle/src/main/release/README.md

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

[cxf-dosgi] 03/03: Update to jline 3.5.1

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit dd0d3a8806b0974e86aee8fed3a93070c9a6d4eb
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 10:13:29 2017 +0200

Update to jline 3.5.1
---
 distribution/multi-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 6ad432c..71eb49f 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -100,7 +100,7 @@
 
 org.jline
 jline
-3.3.1
+3.5.1
 

org.apache.felix

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

[cxf-dosgi] 02/03: Remove sample from distro bundles

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit 9aefd012c31664074c37ad28a597463756e96211
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 10:13:18 2017 +0200

Remove sample from distro bundles
---
 distribution/multi-bundle/distro.bndrun | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/distribution/multi-bundle/distro.bndrun 
b/distribution/multi-bundle/distro.bndrun
index dbcf8d6..923d8a3 100644
--- a/distribution/multi-bundle/distro.bndrun
+++ b/distribution/multi-bundle/distro.bndrun
@@ -35,8 +35,7 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)',\

osgi.identity;filter:='(osgi.identity=com.fasterxml.woodstox.woodstox-core)',\
-   
osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.command)',\
-   
osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.samples.cxf-dosgi-samples-rest-impl)'
+   
osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.command)'
 
 -runbundles: \

com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.8.9,2.8.10)',\

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

[cxf-dosgi] branch master updated (17a5180 -> dd0d3a8)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


from 17a5180  [maven-release-plugin] prepare for next development iteration
 new 57caa5e  Use markdown in readme
 new 9aefd01  Remove sample from distro bundles
 new dd0d3a8  Update to jline 3.5.1

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 distribution/multi-bundle/distro.bndrun  | 3 +--
 distribution/multi-bundle/pom.xml| 2 +-
 distribution/multi-bundle/src/main/release/{README => README.md} | 0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename distribution/multi-bundle/src/main/release/{README => README.md} (100%)

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

[cxf-dosgi] 01/01: [maven-release-plugin] prepare for next development iteration

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit 17a518053aca59e634e153233c8c1ebb9ef526b1
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 09:03:24 2017 +0200

[maven-release-plugin] prepare for next development iteration
---
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 2 +-
 distribution/pom.xml  | 2 +-
 distribution/repository/pom.xml   | 2 +-
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 2 +-
 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-jackson/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 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index d6f2ba5..a19d2ce 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../parent/pom.xml
 
 
diff --git a/decorator/pom.xml b/decorator/pom.xml
index f780779..df06733 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../parent/pom.xml
 
 
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 7f21c6c..ea5bc19 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../pom.xml
 
 
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 906cccf..6ad432c 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -19,7 +19,7 @@

org.apache.cxf.dosgi
cxf-dosgi-distribution-parent
-   2.3.0
+   2.4.0-SNAPSHOT
../pom.xml

 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 51fd110..bc50859 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.3.0
+  2.4.0-SNAPSHOT
   ../parent/pom.xml
 
 
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index 4c1d67b..f3cc289 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../../parent/pom.xml
 
 cxf-dosgi-repository
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 8ecaa7b..a0c4d5b 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../../parent/pom.xml
 
 
diff --git a/itests/pom.xml b/itests/pom.xml
index 0d9ee41..3a89ed2 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../parent/pom.xml
 
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e57b05..15d12e0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -14,7 +14,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.3.0
+2.4.0-SNAPSHOT
 
 
 4.0.0
diff --git a/pom.xml b/pom.xml
index ddacffa..d1c3854 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.3.0
+2.4.0-SNAPSHOT
 
 pom
 CXF DOSGi main
@@ -37,7 +37,7 @@
 
scm:git:http://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
scm:git:https://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
https://gitbox.apache.org/repos/asf?p=cxf-dosgi.git;a=summary
-cxf-dosgi-2.3.0
+HEAD
 
 
 
diff --git a/provider-rs/pom.xml b/provider-rs/pom.xml
index 94a43de..86263b2 100644
--- a/provider-rs/pom.xml
+++ b/provi

[cxf-dosgi] annotated tag cxf-dosgi-2.3.0 created (now 161c3d9)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to annotated tag cxf-dosgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


  at 161c3d9  (tag)
 tagging 4f04e012ee4d9454e2612ee46d2bcc4e64193e86 (commit)
 replaces cxf-dosgi-2.2.0
  by Christian Schneider
  on Sat Sep 23 09:03:17 2017 +0200

- Log -
[maven-release-plugin] copy for tag cxf-dosgi-2.3.0
---

This annotated tag includes the following new commits:

 new 4f04e01  [maven-release-plugin] prepare release cxf-dosgi-2.3.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

[cxf-dosgi] branch master updated (ee6f8dd -> 17a5180)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


from ee6f8dd  Switch back to cxf 3.2.0 for redo of release
 add 4f04e01  [maven-release-plugin] prepare release cxf-dosgi-2.3.0
 new 17a5180  [maven-release-plugin] prepare for next development iteration

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

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

[cxf-dosgi] 01/01: [maven-release-plugin] prepare release cxf-dosgi-2.3.0

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to annotated tag cxf-dosgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git

commit 4f04e012ee4d9454e2612ee46d2bcc4e64193e86
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 08:58:34 2017 +0200

[maven-release-plugin] prepare release cxf-dosgi-2.3.0
---
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 2 +-
 distribution/pom.xml  | 2 +-
 distribution/repository/pom.xml   | 2 +-
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 2 +-
 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-jackson/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 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index a19d2ce..d6f2ba5 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../parent/pom.xml
 
 
diff --git a/decorator/pom.xml b/decorator/pom.xml
index df06733..f780779 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../parent/pom.xml
 
 
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index ea5bc19..7f21c6c 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../pom.xml
 
 
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 6ad432c..906cccf 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -19,7 +19,7 @@

org.apache.cxf.dosgi
cxf-dosgi-distribution-parent
-   2.4.0-SNAPSHOT
+   2.3.0
../pom.xml

 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index bc50859..51fd110 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.4.0-SNAPSHOT
+  2.3.0
   ../parent/pom.xml
 
 
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index f3cc289..4c1d67b 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../../parent/pom.xml
 
 cxf-dosgi-repository
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index a0c4d5b..8ecaa7b 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../../parent/pom.xml
 
 
diff --git a/itests/pom.xml b/itests/pom.xml
index 3a89ed2..0d9ee41 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.4.0-SNAPSHOT
+2.3.0
 ../parent/pom.xml
 
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 15d12e0..8e57b05 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -14,7 +14,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.4.0-SNAPSHOT
+2.3.0
 
 
 4.0.0
diff --git a/pom.xml b/pom.xml
index d1c3854..ddacffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.4.0-SNAPSHOT
+2.3.0
 
 pom
 CXF DOSGi main
@@ -37,7 +37,7 @@
 
scm:git:http://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
scm:git:https://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
https://gitbox.apache.org/repos/asf?p=cxf-dosgi.git;a=summary
-HEAD
+cxf-dosgi-2.3.0
 
 
 
diff --git a/provider-rs/pom.xml b/provider-rs/pom.xml
index 86263b2..94a43de 100644
--- a/provider-rs/pom.xml
+++ b/pr

[cxf-dosgi] annotated tag cxf-dosgi-2.3.0 deleted (was 3798d10)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to annotated tag cxf-dosgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


*** WARNING: tag cxf-dosgi-2.3.0 was deleted! ***

   tag was  3798d10

The revisions that were on this annotated tag are still contained in
other references; therefore, this change does not discard any commits
from the repository.

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

[cxf-dosgi] 03/03: Switch back to cxf 3.2.0 for redo of release

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit ee6f8dd0f4d110db8a9fbd4c9cba65f68ad24fec
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 08:53:28 2017 +0200

Switch back to cxf 3.2.0 for redo of release
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 8a7d1c4..15d12e0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
 6.0.0
 5.0.0
 1.11.0
-3.2.1-SNAPSHOT
+3.2.0
 5.6.8
 3.4.8
 3.0

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

[cxf-dosgi] branch master updated (641c320 -> ee6f8dd)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


from 641c320  Update to CXF 3.2.1-SNAPSHOT
 new 49577b6  Document swagger dependencies
 new c15671f  Add LICENSE and NOTICE to distro
 new ee6f8dd  Switch back to cxf 3.2.0 for redo of release

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 distribution/multi-bundle/pom.xml| 2 ++
 distribution/multi-bundle/src/main/assembly/assembly.xml | 4 
 parent/pom.xml   | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

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

[cxf-dosgi] 01/03: Document swagger dependencies

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit 49577b6d01b76c2df8565089883ce3c817f4882b
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 08:40:27 2017 +0200

Document swagger dependencies
---
 distribution/multi-bundle/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index db48238..6ad432c 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -182,6 +182,8 @@



+   
+   

org.webjars
swagger-ui

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

[cxf-dosgi] 02/03: Add LICENSE and NOTICE to distro

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit c15671f3db0627d03eca17c0da80622bf9cab680
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Sat Sep 23 08:42:20 2017 +0200

Add LICENSE and NOTICE to distro
---
 distribution/multi-bundle/src/main/assembly/assembly.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/distribution/multi-bundle/src/main/assembly/assembly.xml 
b/distribution/multi-bundle/src/main/assembly/assembly.xml
index 276b8a8..071928b 100644
--- a/distribution/multi-bundle/src/main/assembly/assembly.xml
+++ b/distribution/multi-bundle/src/main/assembly/assembly.xml
@@ -72,5 +72,9 @@
   src/main/release
   .
 
+
+   target/maven-shared-archive-resources/META-INF
+   .
+
   
 

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

[cxf-dosgi] branch master updated: Update to CXF 3.2.1-SNAPSHOT

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 641c320  Update to CXF 3.2.1-SNAPSHOT
641c320 is described below

commit 641c3208943ce8cd25250952a70e59d76692b349
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Fri Sep 22 10:45:10 2017 +0200

Update to CXF 3.2.1-SNAPSHOT
---
 distribution/multi-bundle/distro.bndrun | 52 -
 distribution/multi-bundle/pom.xml   |  5 
 parent/pom.xml  |  2 +-
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/distribution/multi-bundle/distro.bndrun 
b/distribution/multi-bundle/distro.bndrun
index 36c8b5b..dbcf8d6 100644
--- a/distribution/multi-bundle/distro.bndrun
+++ b/distribution/multi-bundle/distro.bndrun
@@ -28,20 +28,17 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.http.jetty)',\

osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.cxf-dosgi-provider-ws)',\

osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.topology-manager)',\
-   
osgi.identity;filter:='(&(osgi.identity=org.apache.aries.rsa.discovery.command)(version>=1.9.0))',\

osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.cxf-dosgi-provider-rs)',\
osgi.identity;filter:='(osgi.identity=org.webjars.swagger-ui)',\

osgi.identity;filter:='(osgi.identity=org.apache.cxf.cxf-rt-rs-service-description-swagger)',\

osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.zookeeper)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\
-   
osgi.identity;filter:='(&(osgi.identity=org.apache.felix.metatype)(version>=1.1.2))',\
-   
osgi.identity;filter:='(&(osgi.identity=org.apache.cxf.cxf-rt-ws-policy)(version>=3.2.0))',\
-   
osgi.identity;filter:='(&(osgi.identity=com.fasterxml.woodstox.woodstox-core)(version>=5.0.3))'
+   osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)',\
+   
osgi.identity;filter:='(osgi.identity=com.fasterxml.woodstox.woodstox-core)',\
+   
osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.command)',\
+   
osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.samples.cxf-dosgi-samples-rest-impl)'
 
 -runbundles: \
-   
com.fasterxml.jackson.core.jackson-annotations;version='[2.8.9,2.8.10)',\
-   com.fasterxml.jackson.core.jackson-core;version='[2.8.9,2.8.10)',\
-   com.fasterxml.jackson.core.jackson-databind;version='[2.8.9,2.8.10)',\

com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.8.9,2.8.10)',\
com.fasterxml.woodstox.woodstox-core;version='[5.0.3,5.0.4)',\
com.google.guava;version='[20.0.0,20.0.1)',\
@@ -59,24 +56,6 @@
org.apache.aries.rsa.spi;version='[1.11.0,1.11.1)',\
org.apache.aries.rsa.topology-manager;version='[1.11.0,1.11.1)',\
org.apache.commons.lang3;version='[3.6.0,3.6.1)',\
-   org.apache.cxf.cxf-core;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-bindings-soap;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-bindings-xml;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-databinding-aegis;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-databinding-jaxb;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-frontend-jaxws;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-frontend-simple;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-rs-client;version='[3.2.0,3.2.1)',\
-   
org.apache.cxf.cxf-rt-rs-service-description-swagger;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-transports-http;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-ws-policy;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.cxf-rt-wsdl;version='[3.2.0,3.2.1)',\
-   org.apache.cxf.dosgi.cxf-dosgi-common;version='[2.3.0,2.3.1)',\
-   org.apache.cxf.dosgi.cxf-dosgi-provider-rs;version='[2.3.0,2.3.1)',\
-   org.apache.cxf.dosgi.cxf-dosgi-provider-ws;version='[2.3.0,2.3.1)',\
-   
org.apache.cxf.dosgi.samples.cxf-dosgi-samples-rest-api;version='[2.3.0,2.3.1)',\
-   
org.apache.cxf.dosgi.samples.cxf-dosgi-samples-rest-impl;version='[2.3.0,2.3.1)',\
org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\
org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
org.apache.felix.eventadmin;version='[1.4.6,1.4.7)',\
@@ -89,7 +68,6 @@
org.apache.felix.metatype;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.0.12,2.0.13)',\
org.apache.hadoop.zookeeper;version='[3.4.10,3.4.11)',\
-   org.apache.neethi;version='[3.1.0,3.1.1)',\
org.apache.servicemix.bundles.r

[cxf] branch master updated: Remove unused parameter

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new b7fb580  Remove unused parameter
b7fb580 is described below

commit b7fb580769382149f7fd362da933a426bdfbd740
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 20:11:04 2017 +0200

Remove unused parameter
---
 .../main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
index f3a30ba..376b216 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java
@@ -47,7 +47,7 @@ public class SwaggerUiResolver {
 if (cl instanceof URLClassLoader) {
 for (URL url : ((URLClassLoader)cl).getURLs()) {
 String root = 
-checkUiRoot(url.toString(), 
swaggerUiMavenGroupAndArtifact, swaggerUiVersion);
+checkUiRoot(url.toString(), swaggerUiVersion);
 if (root != null) {
 return root;
 }
@@ -56,7 +56,7 @@ public class SwaggerUiResolver {
 Enumeration urls = cl.getResources(UI_RESOURCES_ROOT_START);
 while (urls.hasMoreElements()) {
 String urlStr = 
urls.nextElement().toString().replace(UI_RESOURCES_ROOT_START, ""); 
-String root = checkUiRoot(urlStr, 
swaggerUiMavenGroupAndArtifact, swaggerUiVersion);
+String root = checkUiRoot(urlStr, swaggerUiVersion);
 if (root != null) {
 return root;
 }
@@ -67,7 +67,7 @@ public class SwaggerUiResolver {
 return null;
 }
 
-protected static String checkUiRoot(String urlStr, String 
swaggerUiMavenGroupAndArtifact, String swaggerUiVersion) {
+protected static String checkUiRoot(String urlStr, String 
swaggerUiVersion) {
 int swaggerUiIndex = urlStr.lastIndexOf("/swagger-ui-");
 if (swaggerUiIndex != -1) {
 boolean urlEndsWithJarSep = urlStr.endsWith(".jar!/");

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

[cxf-dosgi] 01/03: Fix git url

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit 95e93322bf1b634dc0b2f942632e199b88b0cfac
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 13:04:22 2017 +0200

Fix git url
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6c2edc6..5c1406a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,8 @@
 CXF DOSGi main
  
 
-scm:g...@github.com:apache/cxf-dosgi.git
-
scm:g...@github.com:apache/cxf-dosgi.git
+scm:git:git://github.com/apache/cxf-dosgi.git
+
scm:git:git://github.com/apache/cxf-dosgi.git
 HEAD
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

[cxf-dosgi] branch master updated: [maven-release-plugin] prepare for next development iteration

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new aaf88d7  [maven-release-plugin] prepare for next development iteration
aaf88d7 is described below

commit aaf88d7393bc73f040c44cf2bb641d628aa06859
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 13:14:52 2017 +0200

[maven-release-plugin] prepare for next development iteration
---
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 2 +-
 distribution/pom.xml  | 2 +-
 distribution/repository/pom.xml   | 2 +-
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 2 +-
 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-jackson/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 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index d6f2ba5..a19d2ce 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../parent/pom.xml
 
 
diff --git a/decorator/pom.xml b/decorator/pom.xml
index f780779..df06733 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../parent/pom.xml
 
 
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 7f21c6c..ea5bc19 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../pom.xml
 
 
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 0cdbfd6..a755a55 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -19,7 +19,7 @@

org.apache.cxf.dosgi
cxf-dosgi-distribution-parent
-   2.3.0
+   2.4.0-SNAPSHOT
../pom.xml

 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 51fd110..bc50859 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.3.0
+  2.4.0-SNAPSHOT
   ../parent/pom.xml
 
 
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index 4c1d67b..f3cc289 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../../parent/pom.xml
 
 cxf-dosgi-repository
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 8ecaa7b..a0c4d5b 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../../parent/pom.xml
 
 
diff --git a/itests/pom.xml b/itests/pom.xml
index 0d9ee41..3a89ed2 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0
+2.4.0-SNAPSHOT
 ../parent/pom.xml
 
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e57b05..15d12e0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -14,7 +14,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.3.0
+2.4.0-SNAPSHOT
 
 
 4.0.0
diff --git a/pom.xml b/pom.xml
index ddacffa..d1c3854 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-main
-2.3.0
+2.4.0-SNAPSHOT
 
 pom
 CXF DOSGi main
@@ -37,7 +37,7 @@
 
scm:git:http://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
scm:git:https://gitbox.apache.org/repos/asf/cxf-dosgi.git
 
https://gitbox.apache.org/repos/asf?p=cxf-dosgi.git;a=s

[cxf-dosgi] annotated tag cxf-dosgi-2.3.0 created (now 3798d10)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to annotated tag cxf-dosgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


  at 3798d10  (tag)
 tagging 7fecec14c1fad6849a4e6ce5194a7f7dcac0c078 (commit)
 replaces cxf-dosgi-2.2.0
  by Christian Schneider
  on Thu Sep 21 13:14:46 2017 +0200

- Log -
[maven-release-plugin] copy for tag cxf-dosgi-2.3.0
---

No new revisions were added by this update.

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

[cxf-dosgi] 03/03: [maven-release-plugin] prepare release cxf-dosgi-2.3.0

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit 7fecec14c1fad6849a4e6ce5194a7f7dcac0c078
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 13:14:19 2017 +0200

[maven-release-plugin] prepare release cxf-dosgi-2.3.0
---
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 5 ++---
 distribution/pom.xml  | 2 +-
 distribution/repository/pom.xml   | 2 +-
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 2 +-
 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-jackson/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 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 27 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 1ec2b12..d6f2ba5 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0-SNAPSHOT
+2.3.0
 ../parent/pom.xml
 
 
diff --git a/decorator/pom.xml b/decorator/pom.xml
index 4717212..f780779 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0-SNAPSHOT
+2.3.0
 ../parent/pom.xml
 
 
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index f985618..7f21c6c 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.3.0-SNAPSHOT
+2.3.0
 ../pom.xml
 
 
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 179a5b1..0cdbfd6 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/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-multibundle-distribution
@@ -20,7 +19,7 @@

org.apache.cxf.dosgi
cxf-dosgi-distribution-parent
-   2.3.0-SNAPSHOT
+   2.3.0
../pom.xml

 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6c18e7d..51fd110 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.3.0-SNAPSHOT
+  2.3.0
   ../parent/pom.xml
 
 
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index 164f198..4c1d67b 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0-SNAPSHOT
+2.3.0
 ../../parent/pom.xml
 
 cxf-dosgi-repository
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 8d0fe75..8ecaa7b 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0-SNAPSHOT
+2.3.0
 ../../parent/pom.xml
 
 
diff --git a/itests/pom.xml b/itests/pom.xml
index 9775de0..0d9ee41 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.3.0-SNAPSHOT
+2.3.0
 ../parent/pom.xml
 
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 0ec9007..8e57b05 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -14,7

[cxf-dosgi] 02/03: Fix git url

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit ad7438d9d121eed0d414e3daeb6bacc77ea90dc7
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 13:11:55 2017 +0200

Fix git url
---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5c1406a..48fdd43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,9 @@
 CXF DOSGi main
  
 
-scm:git:git://github.com/apache/cxf-dosgi.git
-
scm:git:git://github.com/apache/cxf-dosgi.git
+
scm:git:http://gitbox.apache.org/repos/asf/cxf-dosgi.git
+
scm:git:https://gitbox.apache.org/repos/asf/cxf-dosgi.git
+
https://gitbox.apache.org/repos/asf?p=cxf-dosgi.git;a=summary
 HEAD
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

[cxf-dosgi] branch master updated (276d8da -> 7fecec1)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


from 276d8da  Use github uri in pom
 new 95e9332  Fix git url
 new ad7438d  Fix git url
 new 7fecec1  [maven-release-plugin] prepare release cxf-dosgi-2.3.0

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 5 ++---
 distribution/pom.xml  | 2 +-
 distribution/repository/pom.xml   | 2 +-
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 2 +-
 parent/pom.xml| 2 +-
 pom.xml   | 9 +
 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-jackson/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 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 27 files changed, 32 insertions(+), 32 deletions(-)

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

[cxf-dosgi] branch master updated: Use github uri in pom

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 276d8da  Use github uri in pom
276d8da is described below

commit 276d8da2b7b00ff79c2a62b1f796e095f53a2699
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 12:28:51 2017 +0200

Use github uri in pom
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e4132ae..6c2edc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,8 @@
 CXF DOSGi main
  
 
-
scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git
-
scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git
+scm:g...@github.com:apache/cxf-dosgi.git
+
scm:g...@github.com:apache/cxf-dosgi.git
 HEAD
 
 

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

[cxf-dosgi] branch master updated (ea16df0 -> 722f4c2)

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.


from ea16df0  Make sure we do not export the IntentsProvider interface
 new de19dd5  Add swagger UI bundle to distro
 new 722f4c2  Add itest for swagger json

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 distribution/multi-bundle/distro.bndrun| 89 --
 distribution/multi-bundle/pom.xml  |  5 ++
 .../cxf/dosgi/itests/multi/TestExportService.java  |  4 +
 3 files changed, 56 insertions(+), 42 deletions(-)

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

[cxf-dosgi] 01/02: Add swagger UI bundle to distro

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit de19dd5292df71d4b1b9359050667668b73a123e
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 10:48:21 2017 +0200

Add swagger UI bundle to distro
---
 distribution/multi-bundle/distro.bndrun | 89 +
 distribution/multi-bundle/pom.xml   |  5 ++
 2 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/distribution/multi-bundle/distro.bndrun 
b/distribution/multi-bundle/distro.bndrun
index df08e7b..36c8b5b 100644
--- a/distribution/multi-bundle/distro.bndrun
+++ b/distribution/multi-bundle/distro.bndrun
@@ -4,29 +4,21 @@
 -runblacklist: \
osgi.identity;filter:='(osgi.identity=slf4j.api)',\
osgi.identity;filter:='(osgi.identity=osgi.cmpn)',\
-   osgi.identity;filter:='(osgi.identity=osgi.core)'
+   osgi.identity;filter:='(osgi.identity=osgi.core)',\
+   osgi.identity;filter:='(osgi.identity=org.osgi.service.http)'
 
 -runfw: org.apache.felix.framework;version='[5.6.8,5.6.8]'
 -runee: JavaSE-1.8
-
+#  rsa.export.policy.filter="(name=rest)",\
 -runproperties: \
org.ops4j.pax.logging.DefaultServiceLog.level=INFO,\
-   rsa.export.policy.filter="(name=rest)",\
org.osgi.framework.bootdelegation=com.sun.*,\

org.osgi.framework.system.packages.extra='sun.misc,javax.xml.bind.annotation;version=2.2.1,javax.xml.bind;version=2.2.1'
-   
-# felix.cm.loglevel=4,\
-#  felix.fileinstall.dir=./etc,\
-#  felix.fileinstall.noInitialDelay=true,\
-#  felix.fileinstall.enableConfigSave=false,\
-#  felix.fileinstall.log.level=4,\
-#  org.osgi.framework.startlevel.beginning=100,\
-
-# Only needed for karaf console
-#  karaf.systemBundlesStartLevel=0,\
-#  karaf.startLocalConsole=true,\
-#  karaf.local.roles='admin,manager,viewer,systembundles',\
-
+   felix.cm.loglevel=4,\
+   felix.fileinstall.dir=./etc,\
+   felix.fileinstall.noInitialDelay=true,\
+   felix.fileinstall.log.level=4,\
+   org.ops4j.pax.logging.DefaultServiceLog.level=INFO
 
 -runrequires: \
osgi.identity;filter:='(osgi.identity=org.apache.felix.fileinstall)',\
@@ -38,46 +30,34 @@

osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.topology-manager)',\

osgi.identity;filter:='(&(osgi.identity=org.apache.aries.rsa.discovery.command)(version>=1.9.0))',\

osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.cxf-dosgi-provider-rs)',\
+   osgi.identity;filter:='(osgi.identity=org.webjars.swagger-ui)',\

osgi.identity;filter:='(osgi.identity=org.apache.cxf.cxf-rt-rs-service-description-swagger)',\

osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.zookeeper)',\
-   osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
+   osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\
+   
osgi.identity;filter:='(&(osgi.identity=org.apache.felix.metatype)(version>=1.1.2))',\
+   
osgi.identity;filter:='(&(osgi.identity=org.apache.cxf.cxf-rt-ws-policy)(version>=3.2.0))',\
+   
osgi.identity;filter:='(&(osgi.identity=com.fasterxml.woodstox.woodstox-core)(version>=5.0.3))'
+
 -runbundles: \
-   org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
-   org.apache.felix.fileinstall;version='[3.5.2,3.5.3)',\
-   org.objectweb.asm.all;version='[5.0.4,5.0.5)',\
-   org.ops4j.pax.logging.pax-logging-api;version='[1.8.5,1.8.6)',\
-   org.ops4j.pax.logging.pax-logging-service;version='[1.8.5,1.8.6)',\
-   javax.servlet-api;version='[3.1.0,3.1.1)',\
-   org.apache.felix.eventadmin;version='[1.4.6,1.4.7)',\
-   org.apache.felix.http.api;version='[2.3.2,2.3.3)',\
-   org.apache.felix.http.jetty;version='[3.0.0,3.0.1)',\
-   org.apache.servicemix.bundles.wsdl4j;version='[1.6.3,1.6.4)',\
-   org.fusesource.jansi;version='[1.13.0,1.13.1)',\
-   org.apache.aries.rsa.core;version='[1.11.0,1.11.1)',\
-   org.apache.aries.rsa.discovery.command;version='[1.11.0,1.11.1)',\
-   org.apache.aries.rsa.spi;version='[1.11.0,1.11.1)',\
-   org.apache.aries.rsa.topology-manager;version='[1.11.0,1.11.1)',\
-   org.apache.cxf.dosgi.cxf-dosgi-common;version='[2.3.0,2.3.1)',\
-   org.apache.cxf.dosgi.cxf-dosgi-provider-rs;version='[2.3.0,2.3.1)',\
-   org.apache.cxf.dosgi.cxf-dosgi-provider-ws;version='[2.3.0,2.3.1)',\
-   org.apache.ws.xmlschema.core;version='[2.2.2,2.2.3)',\
-   org.apache.felix.scr;version='[2.0.12,2.0.13)',\

com.fasterxml.jackson.core.jackson-annotations;version='[2.8.9,2.8.10)',\
com.fasterxml.jackson.core.jackson-core;version='[2.8.9,2.8.10)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.8.9,2.8.10)',\

com.faster

[cxf-dosgi] 02/02: Add itest for swagger json

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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

commit 722f4c261a9798dce71b3839a7ddcb670ae399a4
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 10:48:53 2017 +0200

Add itest for swagger json
---
 .../java/org/apache/cxf/dosgi/itests/multi/TestExportService.java | 4 
 1 file changed, 4 insertions(+)

diff --git 
a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java
 
b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java
index a4bc5a1..fcc70c0 100644
--- 
a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java
+++ 
b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java
@@ -90,6 +90,10 @@ public class TestExportService extends AbstractDosgiTest {
 }
 );
 Assert.assertEquals("Buy some coffee", task.getTitle());
+final WebClient swaggerClient = WebClient.create(REST_SERVICE_URI + 
"/swagger.json");
+String swaggerJson = swaggerClient.get(String.class);
+Assert.assertEquals("{\"swagger\":\"2.0\"", swaggerJson.substring(0, 
16));
+
 }
 
 @Test

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

[cxf-dosgi] branch master updated: Make sure we do not export the IntentsProvider interface

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new ea16df0  Make sure we do not export the IntentsProvider interface
ea16df0 is described below

commit ea16df099b7802ebe8cf23465dc97c101c8008ee
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Wed Sep 20 18:05:24 2017 +0200

Make sure we do not export the IntentsProvider interface
---
 .../java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
 
b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
index ac4b8dc..1ee6f4c 100644
--- 
a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
+++ 
b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
@@ -36,7 +36,7 @@ import org.osgi.service.component.annotations.Component;
 name = "TaskResource", //
 property = //
 { //
-  "service.exported.interfaces=*", //
+  
"service.exported.interfaces=org.apache.cxf.dosgi.samples.rest.TaskResource", //
   "service.exported.configs=org.apache.cxf.rs", //
   "org.apache.cxf.rs.address=/tasks" //
 } //

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

[cxf-dosgi] branch master updated: Fix rest example

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new ec7ca50  Fix rest example
ec7ca50 is described below

commit ec7ca5023c0209adb9bc2cac3f1e62715bb093e2
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Wed Sep 20 16:21:02 2017 +0200

Fix rest example
---
 samples/rest/README.md | 14 --
 .../org/apache/cxf/dosgi/samples/rest/TaskResource.java| 14 +++---
 .../cxf/dosgi/samples/rest/client/TaskResourceCommand.java |  2 +-
 .../cxf/dosgi/samples/rest/impl/TaskResourceImpl.java  | 10 +++---
 .../cxf/dosgi/samples/rest/impl/TaskResourceImpl.java  | 11 ---
 5 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/samples/rest/README.md b/samples/rest/README.md
index df7d98a..d05989a 100644
--- a/samples/rest/README.md
+++ b/samples/rest/README.md
@@ -16,19 +16,29 @@ Unpack karaf 4 into a server and client directory.
 Start the server karaf
 
 ```
-feature:repo-add cxf-dosgi-samples 2.2.0-SNAPSHOT
+feature:repo-add cxf-dosgi-samples 2.3.0
 feature:install cxf-dosgi-sample-rest-impl
 rsa:endpoints
 ```
 
 The last command should show one endpoint with a URI as id. You should be able 
to open the url in the browser. The browser should show the predefined tasks as 
xml.
 
+```
+curl -X POST --header 'Content-Type: application/json' --header 'Accept: 
application/json' -d '{task:{id: 3, title: "Another task"}}' 
'http://localhost:8181/cxf/tasks/'
+```
+
+Check that task was added
+
+```
+curl --header "Accept:application/json" http://localhost:8181/cxf/tasks/3
+```
+
 ### Install client 
 
 Start the client karaf
 
 ```
-feature:repo-add cxf-dosgi-samples 2.0.0
+feature:repo-add cxf-dosgi-samples 2.3.0
 feature:install cxf-dosgi-sample-rest-client
 ```
 Use commands to test
diff --git 
a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
 
b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
index 15630f7..07a6ae7 100644
--- 
a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
+++ 
b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
@@ -18,8 +18,10 @@
  */
 package org.apache.cxf.dosgi.samples.rest;
 
+import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -32,7 +34,8 @@ import io.swagger.annotations.ApiResponses;
 
 @Api(tags = {"tasks"})
 @Path("")
-@Produces("application/xml")
+@Consumes({"application/xml", "application/json"})
+@Produces({"application/xml", "application/json"})
 public interface TaskResource {
 
 @ApiOperation(value = "Get task by ID", notes = "Returns a single task", 
response = Task.class)
@@ -43,9 +46,14 @@ public interface TaskResource {
 @Path("/{id}")
 Task get(@PathParam("id") Integer id);
 
-@ApiOperation(value = "Add task or update existing task")
+@ApiOperation(value = "Add task")
+@POST
+void add(Task task);
+
+@ApiOperation(value = "Update existing task")
 @PUT
-void addOrUpdate(Task task);
+@Path("/{id}")
+void update(Integer id, Task task);
 
 @ApiOperation(value = "Deletes a task")
 @ApiResponses(value = {
diff --git 
a/samples/rest/client/src/main/java/org/apache/cxf/dosgi/samples/rest/client/TaskResourceCommand.java
 
b/samples/rest/client/src/main/java/org/apache/cxf/dosgi/samples/rest/client/TaskResourceCommand.java
index 9e13a52..e84bc97 100644
--- 
a/samples/rest/client/src/main/java/org/apache/cxf/dosgi/samples/rest/client/TaskResourceCommand.java
+++ 
b/samples/rest/client/src/main/java/org/apache/cxf/dosgi/samples/rest/client/TaskResourceCommand.java
@@ -49,7 +49,7 @@ public class TaskResourceCommand {
 
 public void add(Integer id, String title) {
 Task task = new Task(id, title, "");
-taskService.addOrUpdate(task);
+taskService.add(task);
 }
 
 public void delete(Integer id) {
diff --git 
a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
 
b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
index 8531559..7753ea3 100644
--- 
a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
+++ 
b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
@@ -59,12 +59,12 @@ public class TaskResourceImpl implements Task

[cxf-dosgi] branch master updated: update release notes for 2.3.0

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 090d71d  update release notes for 2.3.0
090d71d is described below

commit 090d71df6d5c64b8cdc60f6f8031645fe8d80554
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Wed Sep 20 14:08:55 2017 +0200

update release notes for 2.3.0
---
 release_notes.md | 12 
 1 file changed, 12 insertions(+)

diff --git a/release_notes.md b/release_notes.md
index e04fde7..be74e53 100644
--- a/release_notes.md
+++ b/release_notes.md
@@ -1,6 +1,18 @@
 Release Notes - CXF Distributed OSGi
 
 
+2.3.0
+=
+
+* Bug
+* [DOSGI-254] - ServiceInvocationHandler does not handle checked 
super-interface exceptions correctly
+* [DOSGI-267] - ContainerRequestFilter intents do not get registered as 
providers
+* [DOSGI-275] - Include felix and samples in multibundle distro
+
+* Improvement
+* [DOSGI-273] - Use bnd resolver to create multibundle distro
+* [DOSGI-274] - Upgrade to CXF 3.2.0
+
 2.2.0
 =
 

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

[cxf-dosgi] branch master updated: Remove out dated release notes and include the current ones from top level

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 4ebdfbf  Remove out dated release notes and include the current ones 
from top level
4ebdfbf is described below

commit 4ebdfbfcbcef9eada134347b0eb2276fb0f504a1
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Mon Sep 18 18:08:58 2017 +0200

Remove out dated release notes and include the current ones from top level
---
 .../multi-bundle/src/main/assembly/assembly.xml|   7 +
 .../src/main/release/release_notes.txt | 295 -
 2 files changed, 7 insertions(+), 295 deletions(-)

diff --git a/distribution/multi-bundle/src/main/assembly/assembly.xml 
b/distribution/multi-bundle/src/main/assembly/assembly.xml
index a3bbbeb..276b8a8 100644
--- a/distribution/multi-bundle/src/main/assembly/assembly.xml
+++ b/distribution/multi-bundle/src/main/assembly/assembly.xml
@@ -43,6 +43,13 @@

   
   
+ 
+   ../..
+   
+   release_notes.md
+   
+   .
+  
   
target/bin
bin
diff --git a/distribution/multi-bundle/src/main/release/release_notes.txt 
b/distribution/multi-bundle/src/main/release/release_notes.txt
deleted file mode 100644
index 889952e..000
--- a/distribution/multi-bundle/src/main/release/release_notes.txt
+++ /dev/null
@@ -1,295 +0,0 @@
-
-Release Notes - CXF Distributed OSGi - Version 1.6.0
-
-
-** Bug
-* [DOSGI-11] - dOSGi creates new databinding instance instead of using a 
spring-loaded databinding if available
-* [DOSGI-196] - Greeter demo does not work in standalone Felix
-* [DOSGI-198] - Imported service is gone after client bundle is restarted
-* [DOSGI-206] - Parse errors for xml files in discovery local and dsw
-* [DOSGI-207] - Update karaf maven plugin to release version
-* [DOSGI-208] - OSGi compendium bundle installed by feature causes problems
-* [DOSGI-210] - Service registration and memory leaks
-
-** Improvement
-* [DOSGI-201] - Create DSOGi distro from karaf feature file
-* [DOSGI-202] - Make DOSGi independent of jdom
-* [DOSGI-203] - Upgrade to cxf 2.7.6
-* [DOSGI-204] - Update osgi spec version to 4.3.1 and felix to 4.2.1
-* [DOSGI-205] - Upgrade to pax exam 3.2
-
-** Task
-* [DOSGI-212] - Update CXF version to 2.7.8
-
-
-Release Notes - CXF Distributed OSGi - Version 1.5.0
-
-
-** Bug
-* [DOSGI-158] - NPE on shutdown of DOSGi service
-* [DOSGI-160] - RemoteServiceAdmin shuts itself down during startup
-* [DOSGI-161] - services sometimes don't get exported
-* [DOSGI-162] - Compilation errors when using OSGi core
-* 4.3.0/4.3.1/5.0.0
-* [DOSGI-164] - NullPointerException on export
-* [DOSGI-165] - exported service is not properly closed and cannot be
-* restarted
-* [DOSGI-166] - List can not be used to register CXF providers with DSW
-* [DOSGI-168] - RemoteServiceAdminCore service parameters handling bugs
-* [DOSGI-172] - o.a.c.d.discovery.zookeeper package classes are not
-* properly synchronized
-* [DOSGI-173] - unregistering an exported service does not remove it
-* from zookeeper (and remote clients)
-* [DOSGI-174] - synchronization issues and resource leaks in
-* TopologyManagerImport and related classes
-* [DOSGI-175] - TopologyManagerImport's reference counter doesn't count
-* [DOSGI-176] - zookeeper discovery sending multiple duplicate endpoint
-* notifications
-* [DOSGI-177] - stopped services still appear as available to clients
-* [DOSGI-180] - CXF service does not disappear if exporting bundle is
-* stopped
-* [DOSGI-188] - services aren't re-imported after RemoteServiceAdmin
-* restart
-* [DOSGI-190] - NodeExistsException and missing endpoint after ZooKeeper
-* is restarted
-* [DOSGI-191] - ZooKeeperDiscovery instance reconnects to ZooKeeper
-* after bundle is stopped
-* [DOSGI-192] - Upgrade to zookeeper 3.3.2 to fix bug with zk event
-* thread shutdown
-* [DOSGI-195] - Exceptions in tests: ClassCastException on
-* SpringBusFactory
-
-** Improvement
-* [DOSGI-167] - Upgrade Aries to the 1.x version for distro
-* [DOSGI-170] - Remove single bundle distro
-* [DOSGI-181] - Reactivate or delete old systests
-* [DOSGI-184] - Split Endpoint repository from TopologyManagerExport
-* [DOSGI-193] - Split discovery.zookeeper package into subpackages
-
-
-Release Notes - CXF Distributed OSGi - Version 1.4.0
-
-
-** Bug
-* [DOSGI-10] - Spring schema handling (intents) doesn't work properly
-* for the single-bundle case
-* [DOSGI-18] - RESTful P

[cxf-dosgi] branch master updated: [DOSGI-275] Fix distro issue

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new d27ab41  [DOSGI-275] Fix distro issue
d27ab41 is described below

commit d27ab41ab52b0c65f7a1bfc84b3080f36514658e
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Mon Sep 18 13:26:24 2017 +0200

[DOSGI-275] Fix distro issue
---
 distribution/multi-bundle/src/main/assembly/assembly.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distribution/multi-bundle/src/main/assembly/assembly.xml 
b/distribution/multi-bundle/src/main/assembly/assembly.xml
index c636eff..a3bbbeb 100644
--- a/distribution/multi-bundle/src/main/assembly/assembly.xml
+++ b/distribution/multi-bundle/src/main/assembly/assembly.xml
@@ -63,6 +63,7 @@
 
 
   src/main/release
+  .
 
   
 

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

[cxf-dosgi] branch master updated: [DOSGI-275] Simplify archive names

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 659ecab  [DOSGI-275] Simplify archive names
659ecab is described below

commit 659ecab18a517b2c7255c09f0d29fcdc870ac02a
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Mon Sep 18 12:55:55 2017 +0200

[DOSGI-275] Simplify archive names
---
 distribution/multi-bundle/pom.xml|  1 +
 distribution/multi-bundle/src/main/assembly/assembly.xml | 11 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index f700702..b55c364 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -300,6 +300,7 @@
single


+   
cxf-dosgi


./src/main/assembly/assembly.xml

diff --git a/distribution/multi-bundle/src/main/assembly/assembly.xml 
b/distribution/multi-bundle/src/main/assembly/assembly.xml
index a06f61b..c636eff 100644
--- a/distribution/multi-bundle/src/main/assembly/assembly.xml
+++ b/distribution/multi-bundle/src/main/assembly/assembly.xml
@@ -25,7 +25,8 @@
 zip
 dir
   
-  false
+  true
+  cxf-dosgi-${project.version}
   


@@ -37,14 +38,14 @@

org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-client


-   apache-cxf-dosgi-${dosgi.version}/samples
+   samples


   
   
   
target/bin
-   apache-cxf-dosgi-${dosgi.version}/bin
+   bin
 
 
   target/distro-unzip/jar
@@ -52,18 +53,16 @@
org.apache.felix.framework*
biz.aQute.launcher*
   
-  
apache-cxf-dosgi-${dosgi.version}/bundle
+  bundle
 
 
   target/maven-shared-archive-resources/META-INF
   
   DEPENDENCIES
   
-  apache-cxf-dosgi-${dosgi.version}
 
 
   src/main/release
-  apache-cxf-dosgi-${dosgi.version}
 
   
 

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

[cxf-dosgi] branch master updated: [DOSGI-275] Include felix and samples in multibundle distro

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new b558f79  [DOSGI-275] Include felix and samples in multibundle distro
b558f79 is described below

commit b558f79e346b9732778f150b5519d354b15709a6
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Mon Sep 18 11:47:47 2017 +0200

[DOSGI-275] Include felix and samples in multibundle distro
---
 distribution/multi-bundle/distro.bndrun|  45 -
 distribution/multi-bundle/pom.xml  |  54 +--
 .../multi-bundle/src/main/assembly/assembly.xml|  35 ---
 distribution/multi-bundle/src/main/release/README  |  14 ++-
 .../src/main/release/conf/config.properties| 102 +
 .../src/main/release/etc/org.ops4j.pax.logging.cfg |   7 ++
 .../cxf/dosgi/itests/multi/MultiBundleTools.java   |   2 +-
 7 files changed, 211 insertions(+), 48 deletions(-)

diff --git a/distribution/multi-bundle/distro.bndrun 
b/distribution/multi-bundle/distro.bndrun
index dd7ba9a..df08e7b 100644
--- a/distribution/multi-bundle/distro.bndrun
+++ b/distribution/multi-bundle/distro.bndrun
@@ -12,7 +12,6 @@
 -runproperties: \
org.ops4j.pax.logging.DefaultServiceLog.level=INFO,\
rsa.export.policy.filter="(name=rest)",\
-   org.apache.felix.http.jettyEnabled=true,\
org.osgi.framework.bootdelegation=com.sun.*,\

org.osgi.framework.system.packages.extra='sun.misc,javax.xml.bind.annotation;version=2.2.1,javax.xml.bind;version=2.2.1'

@@ -37,11 +36,11 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.http.jetty)',\

osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.cxf-dosgi-provider-ws)',\

osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.topology-manager)',\
-   osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\

osgi.identity;filter:='(&(osgi.identity=org.apache.aries.rsa.discovery.command)(version>=1.9.0))',\

osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.cxf-dosgi-provider-rs)',\

osgi.identity;filter:='(osgi.identity=org.apache.cxf.cxf-rt-rs-service-description-swagger)',\
-   
osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.zookeeper)'
+   
osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.zookeeper)',\
+   osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
 -runbundles: \
org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
org.apache.felix.fileinstall;version='[3.5.2,3.5.3)',\
@@ -53,27 +52,11 @@
org.apache.felix.http.api;version='[2.3.2,2.3.3)',\
org.apache.felix.http.jetty;version='[3.0.0,3.0.1)',\
org.apache.servicemix.bundles.wsdl4j;version='[1.6.3,1.6.4)',\
-   org.apache.felix.gogo.command;version='[0.16.0,0.16.1)',\
-   org.apache.felix.gogo.shell;version='[0.12.0,0.12.1)',\
-   org.apache.felix.gogo.runtime;version='[0.10.0,0.10.1)',\
org.fusesource.jansi;version='[1.13.0,1.13.1)',\
-   javax.annotation-api;version='[1.2.0,1.2.1)',\
-   org.apache.servicemix.specs.jsr339-api-2.0.1;version='[2.6.0,2.6.1)',\
org.apache.aries.rsa.core;version='[1.11.0,1.11.1)',\
org.apache.aries.rsa.discovery.command;version='[1.11.0,1.11.1)',\
org.apache.aries.rsa.spi;version='[1.11.0,1.11.1)',\
org.apache.aries.rsa.topology-manager;version='[1.11.0,1.11.1)',\
-   org.apache.cxf.cxf-core;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-bindings-soap;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-bindings-xml;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-databinding-aegis;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-databinding-jaxb;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-frontend-jaxws;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-frontend-simple;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-rs-client;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-transports-http;version='[3.1.12,3.1.13)',\
-   org.apache.cxf.cxf-rt-wsdl;version='[3.1.12,3.1.13)',\
org.apache.cxf.dosgi.cxf-dosgi-common;version='[2.3.0,2.3.1)',\
org.apache.cxf.dosgi.cxf-dosgi-provider-rs;version='[2.3.0,2.3.1)',\
org.apache.cxf.dosgi.cxf-dosgi-provider-ws;version='[2.3.0,2.3.1)',\
@@ -89,10 +72,28 @@
io.swagger.jaxrs;version='[1.5.16,1.5.17)',\
io.swagger.models;version='[1.5.16,1.5.17)',\
javax.validation.api;version='[1.1.0,1.1.1)',\
-   org.apache.commons.lang3;version='[3.2.1,3.2.2)',\
-   
org.apache.cxf.cxf-rt-rs-service-description-swagger;

[cxf-dosgi] branch master updated: [DOSGI-274] Upgrade to CXF 3.2.0

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 25a2ab0  [DOSGI-274] Upgrade to CXF 3.2.0
25a2ab0 is described below

commit 25a2ab05b4ff2a2b1b741bb4d64fd1535b3bf473
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Fri Sep 15 15:32:40 2017 +0200

[DOSGI-274] Upgrade to CXF 3.2.0
---
 distribution/multi-bundle/pom.xml| 5 +
 distribution/repository/pom.xml  | 4 ++--
 parent/pom.xml   | 2 +-
 .../org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index c856e65..f6db721 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -183,6 +183,11 @@
guava
20.0

+   
+   org.apache.commons
+   commons-lang3
+   3.6
+   

 

diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index c6bea15..164f198 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -53,8 +53,8 @@
 
 
 org.apache.servicemix.specs
-
org.apache.servicemix.specs.jsr339-api-2.0.1
-2.6.0
+org.apache.servicemix.specs.jaxrs-api-2.1
+2.9.1
 
 
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 2c6ab61..0ec9007 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
 6.0.0
 5.0.0
 1.11.0
-3.1.12
+3.2.0
 5.6.8
 3.4.8
 3.0
diff --git 
a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
 
b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
index c4171bd..e4dc61d 100644
--- 
a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
+++ 
b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
@@ -88,7 +88,7 @@ public class TaskResourceImpl implements TaskResource, 
IntentsProvider {
 swagger.setDescription("Sample jaxrs application to organize taks");
 swagger.setTitle("Tasks sample");
 swagger.setUsePathBasedConfig(true); // Necessary for OSGi
-swagger.setScan(false);
+// swagger.setScan(false); // Must be set for cxf < 3.2.x
 swagger.setPrettyPrint(true);
 swagger.setSupportSwaggerUi(true);
 return swagger;

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

[cxf-dosgi] branch master updated: [DOSGI-273] Use bnd resolver to create the multi bundle distro

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 8351d60  [DOSGI-273] Use bnd resolver to create the multi bundle distro
8351d60 is described below

commit 8351d60fe33d33f1ec1b7d9aefcce953d0ce1f77
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Fri Sep 15 15:00:57 2017 +0200

[DOSGI-273] Use bnd resolver to create the multi bundle distro
---
 .../features/src/main/resources/features.xml   |  10 -
 distribution/multi-bundle/distro.bndrun|  98 ++
 distribution/multi-bundle/pom.xml  | 370 ++---
 .../multi-bundle/src/main/assembly/assembly.xml|   6 +-
 distribution/multi-bundle/src/main/release/README  |  44 +--
 .../src/main/xsl/equinox_distro_config.xslt|  17 -
 .../src/main/xsl/felix_distro_config.xslt  |  15 -
 .../multi-bundle/src/main/xsl/filter_features.xslt |  27 --
 itests/multi-bundle/pom.xml|  29 +-
 .../cxf/dosgi/itests/multi/AbstractDosgiTest.java  |  16 +-
 .../cxf/dosgi/itests/multi/MultiBundleTools.java   |  62 +---
 .../cxf/dosgi/itests/multi/TestImportService.java  |   2 +-
 .../multi-bundle/src/test/resources/rs-test1.xml   |   2 +-
 parent/pom.xml |  60 ++--
 samples/repository/pom.xml |  43 +--
 samples/rest/impl/pom.xml  |   1 -
 samples/rest/pom.xml   |   4 +-
 samples/soap/pom.xml   |   4 +-
 samples/soap/soap.bndrun   |  48 +--
 samples/ssl/pom.xml|   4 +-
 20 files changed, 472 insertions(+), 390 deletions(-)

diff --git a/distribution/features/src/main/resources/features.xml 
b/distribution/features/src/main/resources/features.xml
index 8297d20..435e610 100644
--- a/distribution/features/src/main/resources/features.xml
+++ b/distribution/features/src/main/resources/features.xml
@@ -3,22 +3,12 @@
 
mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features
 
mvn:org.apache.aries.rsa/rsa-features/${aries.rsa.version}/xml/features
 
-
-mvn:org.ops4j.pax.logging/pax-logging-api/1.8.5
-mvn:org.ops4j.pax.logging/pax-logging-service/1.8.5
-mvn:org.apache.felix/org.apache.felix.configadmin/1.8.8
-mvn:org.apache.felix/org.apache.felix.fileinstall/3.5.0
-mvn:org.apache.aries/org.apache.aries.util/1.1.1
-mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/1.0.1
-
-
 
 aries-rsa-core
 cxf-specs
 cxf-http
 http
 cxf-http-jetty
-mvn:org.apache.felix/org.apache.felix.scr/2.0.2
 
mvn:${project.groupId}/cxf-dosgi-common/${project.version}
 
mvn:${project.groupId}/cxf-dosgi-decorator/${project.version}
 
diff --git a/distribution/multi-bundle/distro.bndrun 
b/distribution/multi-bundle/distro.bndrun
new file mode 100644
index 000..dd7ba9a
--- /dev/null
+++ b/distribution/multi-bundle/distro.bndrun
@@ -0,0 +1,98 @@
+-standalone: target/index.xml
+-runsystemcapabilities: ${native_capability}
+
+-runblacklist: \
+   osgi.identity;filter:='(osgi.identity=slf4j.api)',\
+   osgi.identity;filter:='(osgi.identity=osgi.cmpn)',\
+   osgi.identity;filter:='(osgi.identity=osgi.core)'
+
+-runfw: org.apache.felix.framework;version='[5.6.8,5.6.8]'
+-runee: JavaSE-1.8
+
+-runproperties: \
+   org.ops4j.pax.logging.DefaultServiceLog.level=INFO,\
+   rsa.export.policy.filter="(name=rest)",\
+   org.apache.felix.http.jettyEnabled=true,\
+   org.osgi.framework.bootdelegation=com.sun.*,\
+   
org.osgi.framework.system.packages.extra='sun.misc,javax.xml.bind.annotation;version=2.2.1,javax.xml.bind;version=2.2.1'
+   
+# felix.cm.loglevel=4,\
+#  felix.fileinstall.dir=./etc,\
+#  felix.fileinstall.noInitialDelay=true,\
+#  felix.fileinstall.enableConfigSave=false,\
+#  felix.fileinstall.log.level=4,\
+#  org.osgi.framework.startlevel.beginning=100,\
+
+# Only needed for karaf console
+#  karaf.systemBundlesStartLevel=0,\
+#  karaf.startLocalConsole=true,\
+#  karaf.local.roles='admin,manager,viewer,systembundles',\
+
+
+-runrequires: \
+   osgi.identity;filter:='(osgi.identity=org.apache.felix.fileinstall)',\
+   osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
+   
osgi.identity;filter:='(osgi.identity=org.ops4j.pax.logging.pax-logging-service)',\
+   osgi.identity;filter:='(osgi.identity=org.objectweb.asm.all)',\
+   osgi.identity;filter:='(osgi.identity=org.apache.felix.http.jetty)',\
+   
osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.cxf-dosgi-provider-ws)',\
+   
osgi.identity;filter:

[cxf-dosgi] branch master updated: Use github md syntax

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 2d9c45d  Use github md syntax
2d9c45d is described below

commit 2d9c45d647c74755a61ae70c0180bf21e0f11ab1
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Tue Sep 12 13:20:24 2017 +0200

Use github md syntax
---
 release_notes.txt => release_notes.md | 208 +-
 1 file changed, 102 insertions(+), 106 deletions(-)

diff --git a/release_notes.txt b/release_notes.md
similarity index 73%
rename from release_notes.txt
rename to release_notes.md
index 4af795f..e04fde7 100644
--- a/release_notes.txt
+++ b/release_notes.md
@@ -1,37 +1,40 @@
-Release Notes - CXF Distributed OSGi - Version 2.2.0
-
+Release Notes - CXF Distributed OSGi
+
+
+2.2.0
+=
 
-** Bug
+* Bug
 * [DOSGI-253] - CXF DOSGI JAX-RS incompatible with Camel features
 * [DOSGI-262] - Configure intent objects from service object 
(IntentsProvider, @Features)
 * [DOSGI-264] - Add features to OSGi service using @Features annotation
 
-** Improvement
+* Improvement
 * [DOSGI-268] - Update CXF to 3.1.12
 * [DOSGI-269] - Update Aries RSA to 1.11.0
 
-** New Feature
+* New Feature
 * [DOSGI-261] - Sample for rest with jackson provider
 * [DOSGI-266] - Support for org.apache.cxf.jaxrs.ext.ContextProvider
 * [DOSGI-270] - Create sample for swagger documentation 
 
 
-Release Notes - CXF Distributed OSGi - Version 2.1.0
-
+2.1.0
+=
 
-** Bug
+* Bug
 * [DOSGI-258] - itests fail when port 8080 is in use
 
-** Improvement
+* Improvement
 * [DOSGI-251] - Allow to export services with less service properties
 * [DOSGI-256] - ContextResolver intents should be registered as providers
 * [DOSGI-257] - Allow to set bus properties 
 
 
-Release Notes - CXF Distributed OSGi - Version 2.0.0
-
+2.0.0
+=
 
-** Bug
+* Bug
 * [DOSGI-19] - Discovery Software doesn't notice changed Service 
Properties.
 * [DOSGI-22] - It would benefit the RFC 119 TCK if multiple instances of 
DOSGi could be run in a single OSGi container.
 * [DOSGI-52] - -Dorg.apache.cxf.spring.validation.mode=VALIDATION_NONE 
doesn't have an effect
@@ -55,7 +58,7 @@ Release Notes - CXF Distributed OSGi - Version 2.0.0
 * [DOSGI-240] - Fix checkstyle in eclipse
 * [DOSGI-242] - Refactor provider to prepare for split
 
-** Improvement
+* Improvement
 * [DOSGI-101] - Update the guide on using DOSGI RI withing Eclipse
 * [DOSGI-144] - can not deploy CXF 1.3.1 on Virgo Tomcat 3.5.RELEASE
 * [DOSGI-152] - Update systests2 to use pax-exam 2.5
@@ -70,45 +73,45 @@ Release Notes - CXF Distributed OSGi - Version 2.0.0
 * [DOSGI-249] - Redesign examples
 * [DOSGI-250] - Support capabilities and requirements specified in RSA 1.1
 
-** New Feature
+* New Feature
 * [DOSGI-211] - Support SOAP over JMS in DOSGI
 
-** Task
+* Task
 * [DOSGI-194] - Decide how DOSGi needs to handle 
service.exported.interfaces with multiple values 
 
 
-Release Notes - CXF Distributed OSGi - Version 1.8.0
-
+1.8.0
+=
 
-** Bug
+* Bug
 * [DOSGI-221] - HttpServiceManager.getHttpService sometimes return null
 
-** Improvement
+* Improvement
 * [DOSGI-235] - Switch to Aries RSA release 1.8.0
 * [DOSGI-228] - Upgrade to CXF 3.1.5
 * [DOSGI-229] - Refactor to make Remote Service Admin core independent of 
CXF
 * [DOSGI-232] - Remove code that moved to aries-rsa
 
-** New Feature
+* New Feature
 * [DOSGI-230] - Create TCP provider
 * [DOSGI-231] - Create ExportPolicy SPI
 
 
-Release Notes - CXF Distributed OSGi - Version 1.7.0
-
+1.7.0
+=
 
-** Bug
+* Bug
 * [DOSGI-214] - Endpoint publication to discovery does not always work
 * [DOSGI-215] - ZooKeeperDiscovery restarts ZooKeeper-connection for no 
reason
 * [DOSGI-216] - ZookeeperStarter restarts ZooKeeper too easily
 
-** Improvement
+* Improvement
 * [DOSGI-220] - Upgrade to cxf 3.1.1 
 
-Release Notes - CXF Distributed OSGi - Version 1.6.0
-
+1.6.0
+=
 
-** Bug
+* Bug
 * [DOSGI-11] - dOSGi creates new databinding instance instead of using a 
spring-loaded databinding if available
 * [DOSGI-196] - Greeter demo does not work in standalone Felix
 * [DOSGI-198] - Imported service is gone after client bundle is restarted
@@ -117,21 +120,21 @@ Release Notes - CXF Distributed OSGi - Version 1.6.0
 * [DOSGI-208] - OSGi compendium bundle installed by feature causes

cxf-dosgi git commit: Updating release notes and NOTICE

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 0fe837aa0 -> 06164260c


Updating release notes and NOTICE


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

Branch: refs/heads/master
Commit: 06164260cd2ed65a096bfefee44c1bbd85c4348f
Parents: 0fe837a
Author: Christian Schneider 
Authored: Thu Jul 13 15:16:55 2017 +0200
Committer: Christian Schneider 
Committed: Thu Jul 13 15:16:55 2017 +0200

--
 NOTICE |   9 +
 distribution/NOTICE|   9 -
 distribution/release_notes.txt | 295 --
 release_notes.txt  | 401 
 4 files changed, 410 insertions(+), 304 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/06164260/NOTICE
--
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 000..51527cd
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,9 @@
+
+Apache CXF Distributed OSGi DSW Reference Implementation
+Copyright 2008-2012 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product contains interfaces and specifications Copyright The OSGi 
Alliance.
+

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/06164260/distribution/NOTICE
--
diff --git a/distribution/NOTICE b/distribution/NOTICE
deleted file mode 100644
index 51527cd..000
--- a/distribution/NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Apache CXF Distributed OSGi DSW Reference Implementation
-Copyright 2008-2012 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product contains interfaces and specifications Copyright The OSGi 
Alliance.
-

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/06164260/distribution/release_notes.txt
--
diff --git a/distribution/release_notes.txt b/distribution/release_notes.txt
deleted file mode 100644
index 889952e..000
--- a/distribution/release_notes.txt
+++ /dev/null
@@ -1,295 +0,0 @@
-
-Release Notes - CXF Distributed OSGi - Version 1.6.0
-
-
-** Bug
-* [DOSGI-11] - dOSGi creates new databinding instance instead of using a 
spring-loaded databinding if available
-* [DOSGI-196] - Greeter demo does not work in standalone Felix
-* [DOSGI-198] - Imported service is gone after client bundle is restarted
-* [DOSGI-206] - Parse errors for xml files in discovery local and dsw
-* [DOSGI-207] - Update karaf maven plugin to release version
-* [DOSGI-208] - OSGi compendium bundle installed by feature causes problems
-* [DOSGI-210] - Service registration and memory leaks
-
-** Improvement
-* [DOSGI-201] - Create DSOGi distro from karaf feature file
-* [DOSGI-202] - Make DOSGi independent of jdom
-* [DOSGI-203] - Upgrade to cxf 2.7.6
-* [DOSGI-204] - Update osgi spec version to 4.3.1 and felix to 4.2.1
-* [DOSGI-205] - Upgrade to pax exam 3.2
-
-** Task
-* [DOSGI-212] - Update CXF version to 2.7.8
-
-
-Release Notes - CXF Distributed OSGi - Version 1.5.0
-
-
-** Bug
-* [DOSGI-158] - NPE on shutdown of DOSGi service
-* [DOSGI-160] - RemoteServiceAdmin shuts itself down during startup
-* [DOSGI-161] - services sometimes don't get exported
-* [DOSGI-162] - Compilation errors when using OSGi core
-* 4.3.0/4.3.1/5.0.0
-* [DOSGI-164] - NullPointerException on export
-* [DOSGI-165] - exported service is not properly closed and cannot be
-* restarted
-* [DOSGI-166] - List can not be used to register CXF providers with DSW
-* [DOSGI-168] - RemoteServiceAdminCore service parameters handling bugs
-* [DOSGI-172] - o.a.c.d.discovery.zookeeper package classes are not
-* properly synchronized
-* [DOSGI-173] - unregistering an exported service does not remove it
-* from zookeeper (and remote clients)
-* [DOSGI-174] - synchronization issues and resource leaks in
-* TopologyManagerImport and related classes
-* [DOSGI-175] - TopologyManagerImport's reference counter doesn't count
-* [DOSGI-176] - zookeeper discovery sending multiple duplicate endpoint
-* notifications
-* [DOSGI-177] - stopped services still appear as available to clients
-* [DOSGI-180] - CXF service does not disappear if 

cxf-dosgi git commit: Remove source distro as it is provided by apache-release profile

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 47db4e1bf -> 0fe837aa0


Remove source distro as it is provided by apache-release profile


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

Branch: refs/heads/master
Commit: 0fe837aa0c154ab7452ace6accf13b4161cabf7f
Parents: 47db4e1
Author: Christian Schneider 
Authored: Thu Jul 13 15:11:57 2017 +0200
Committer: Christian Schneider 
Committed: Thu Jul 13 15:11:57 2017 +0200

--
 distribution/NOTICE |   9 +
 distribution/pom.xml|   1 -
 distribution/release_notes.txt  | 295 +++
 distribution/sources/pom.xml|  64 
 distribution/sources/src/main/assembly/src.xml  |  68 -
 distribution/sources/src/main/release/LICENSE   | 262 
 distribution/sources/src/main/release/NOTICE|   9 -
 distribution/sources/src/main/release/README|  57 
 .../sources/src/main/release/release_notes.txt  | 295 ---
 9 files changed, 304 insertions(+), 756 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/0fe837aa/distribution/NOTICE
--
diff --git a/distribution/NOTICE b/distribution/NOTICE
new file mode 100644
index 000..51527cd
--- /dev/null
+++ b/distribution/NOTICE
@@ -0,0 +1,9 @@
+
+Apache CXF Distributed OSGi DSW Reference Implementation
+Copyright 2008-2012 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product contains interfaces and specifications Copyright The OSGi 
Alliance.
+

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/0fe837aa/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 0708d2f..6c18e7d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -39,6 +39,5 @@
   features
   multi-bundle
   repository
-  sources
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/0fe837aa/distribution/release_notes.txt
--
diff --git a/distribution/release_notes.txt b/distribution/release_notes.txt
new file mode 100644
index 000..889952e
--- /dev/null
+++ b/distribution/release_notes.txt
@@ -0,0 +1,295 @@
+
+Release Notes - CXF Distributed OSGi - Version 1.6.0
+
+
+** Bug
+* [DOSGI-11] - dOSGi creates new databinding instance instead of using a 
spring-loaded databinding if available
+* [DOSGI-196] - Greeter demo does not work in standalone Felix
+* [DOSGI-198] - Imported service is gone after client bundle is restarted
+* [DOSGI-206] - Parse errors for xml files in discovery local and dsw
+* [DOSGI-207] - Update karaf maven plugin to release version
+* [DOSGI-208] - OSGi compendium bundle installed by feature causes problems
+* [DOSGI-210] - Service registration and memory leaks
+
+** Improvement
+* [DOSGI-201] - Create DSOGi distro from karaf feature file
+* [DOSGI-202] - Make DOSGi independent of jdom
+* [DOSGI-203] - Upgrade to cxf 2.7.6
+* [DOSGI-204] - Update osgi spec version to 4.3.1 and felix to 4.2.1
+* [DOSGI-205] - Upgrade to pax exam 3.2
+
+** Task
+* [DOSGI-212] - Update CXF version to 2.7.8
+
+
+Release Notes - CXF Distributed OSGi - Version 1.5.0
+
+
+** Bug
+* [DOSGI-158] - NPE on shutdown of DOSGi service
+* [DOSGI-160] - RemoteServiceAdmin shuts itself down during startup
+* [DOSGI-161] - services sometimes don't get exported
+* [DOSGI-162] - Compilation errors when using OSGi core
+* 4.3.0/4.3.1/5.0.0
+* [DOSGI-164] - NullPointerException on export
+* [DOSGI-165] - exported service is not properly closed and cannot be
+* restarted
+* [DOSGI-166] - List can not be used to register CXF providers with DSW
+* [DOSGI-168] - RemoteServiceAdminCore service parameters handling bugs
+* [DOSGI-172] - o.a.c.d.discovery.zookeeper package classes are not
+* properly synchronized
+* [DOSGI-173] - unregistering an exported service does not remove it
+* from zookeeper (and remote clients)
+* [DOSGI-174] - synchronization issues and resource leaks in
+* TopologyManagerImport and related classes
+* [DOSGI-175] - TopologyManagerImport's reference counter doesn't count
+* [DOSGI-176] - 

cxf-dosgi git commit: Update build dependencies

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 22aab955e -> 47db4e1bf


Update build 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/47db4e1b
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/47db4e1b
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/47db4e1b

Branch: refs/heads/master
Commit: 47db4e1bfe82fde87a8d5efaf60292718b9ce78b
Parents: 22aab95
Author: Christian Schneider 
Authored: Thu Jul 13 14:52:09 2017 +0200
Committer: Christian Schneider 
Committed: Thu Jul 13 14:52:09 2017 +0200

--
 parent/pom.xml | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/47db4e1b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6b51b96..3df6250 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -207,18 +207,16 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
-3.5.1
+3.6.1
 
 1.7
 1.7
-256M
-false
 
 
 
 org.apache.maven.plugins
 maven-antrun-plugin
-1.6
+1.8
 
 
 ant
@@ -230,12 +228,12 @@
 
 org.apache.maven.plugins
 maven-resources-plugin
-2.5
+3.0.2
 
 
 org.apache.maven.plugins
 maven-dependency-plugin
-2.8
+3.0.1
 
 
 
@@ -258,7 +256,7 @@
 
 org.apache.maven.plugins
 maven-javadoc-plugin
-2.10.3
+2.10.4
 
 true
 true
@@ -273,7 +271,7 @@
 
 org.apache.felix
 maven-bundle-plugin
-3.2.0
+3.3.0
 true
 
 NONE

cxf-dosgi git commit: Fix duplicates

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master bf243bd12 -> 22aab955e


Fix duplicates


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

Branch: refs/heads/master
Commit: 22aab955e9569e5b2d76d5d8c2c2ad1fb2ded4ef
Parents: bf243bd
Author: Christian Schneider 
Authored: Thu Jul 13 14:48:29 2017 +0200
Committer: Christian Schneider 
Committed: Thu Jul 13 14:48:29 2017 +0200

--
 distribution/pom.xml | 2 --
 distribution/sources/pom.xml | 2 --
 itests/pom.xml   | 1 -
 samples/rest/pom.xml | 1 -
 samples/ssl/pom.xml  | 1 -
 5 files changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/22aab955/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 0370e29..0708d2f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -19,9 +19,7 @@
 -->
 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
-org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.3.0-SNAPSHOT
 pom
 CXF DOSGi Distribution Parent
 http://cxf.apache.org

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/22aab955/distribution/sources/pom.xml
--
diff --git a/distribution/sources/pom.xml b/distribution/sources/pom.xml
index 3303a9f..35d5ad3 100644
--- a/distribution/sources/pom.xml
+++ b/distribution/sources/pom.xml
@@ -20,9 +20,7 @@
 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
-org.apache.cxf.dosgi
 cxf-dosgi-source-distribution
-2.3.0-SNAPSHOT
 CXF DOSGi Source Distribution
 http://cxf.apache.org
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/22aab955/itests/pom.xml
--
diff --git a/itests/pom.xml b/itests/pom.xml
index af4683d..9775de0 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -30,7 +30,6 @@
 
 org.apache.cxf.dosgi.systests
 cxf-dosgi-itests
-2.3.0-SNAPSHOT
 pom
 
 CXF DOSGi Integration Tests

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/22aab955/samples/rest/pom.xml
--
diff --git a/samples/rest/pom.xml b/samples/rest/pom.xml
index 12124d9..b055cf1 100644
--- a/samples/rest/pom.xml
+++ b/samples/rest/pom.xml
@@ -12,7 +12,6 @@
 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
-org.apache.cxf.dosgi.samples
 cxf-dosgi-samples-rest-parent
 pom
 CXF DOSGi Samples REST Parent

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/22aab955/samples/ssl/pom.xml
--
diff --git a/samples/ssl/pom.xml b/samples/ssl/pom.xml
index c6e9656..d42faa0 100644
--- a/samples/ssl/pom.xml
+++ b/samples/ssl/pom.xml
@@ -20,7 +20,6 @@
 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
-org.apache.cxf.dosgi.samples
 cxf-dosgi-samples-ssl-parent
 pom
 CXF DOSGi Greeter Bundles

cxf-dosgi git commit: [DOSGI-267] Treat all intents annotated with @Provider as providers

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 88b51ef4c -> bf243bd12


[DOSGI-267] Treat all intents annotated with @Provider as providers


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

Branch: refs/heads/master
Commit: bf243bd129d1191c9ba325d5a163d3d29707461f
Parents: 88b51ef
Author: Richard Begg 
Authored: Thu Jul 13 13:38:20 2017 +1000
Committer: Richard Begg 
Committed: Thu Jul 13 13:38:20 2017 +1000

--
 .../java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/bf243bd1/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 975c97f..160f185 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
@@ -32,6 +32,7 @@ import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.MessageBodyReader;
 import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
 
 import org.apache.aries.rsa.spi.DistributionProvider;
 import org.apache.aries.rsa.spi.Endpoint;
@@ -173,7 +174,8 @@ public class RsProvider extends BaseDistributionProvider 
implements Distribution
 }
 
 private boolean isProvider(Object intent) {
-return (intent instanceof ExceptionMapper) // 
+return intent.getClass().getAnnotation(Provider.class) != null //
+|| (intent instanceof ExceptionMapper) // 
 || (intent instanceof MessageBodyReader) //
 || (intent instanceof MessageBodyWriter) //
 || (intent instanceof ContextResolver) //

[1/2] cxf-dosgi git commit: [DOSGI-254] Refactor to extract exception mapping

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 5b953b2dd -> 88b51ef4c


[DOSGI-254] Refactor to extract exception mapping


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

Branch: refs/heads/master
Commit: 97873bb00d3fd3343351368d4a95f23992b2cee4
Parents: 5b953b2
Author: Christian Schneider 
Authored: Tue Jul 11 11:27:18 2017 +0200
Committer: Christian Schneider 
Committed: Tue Jul 11 11:27:18 2017 +0200

--
 .../cxf/dosgi/common/proxy/ExceptionMapper.java | 75 
 .../common/proxy/ServiceInvocationHandler.java  | 44 ++--
 2 files changed, 80 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/97873bb0/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java 
b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
new file mode 100644
index 000..77c72b2
--- /dev/null
+++ 
b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.dosgi.common.proxy;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.osgi.framework.ServiceException;
+
+public class ExceptionMapper {
+private static final String REMOTE_EXCEPTION_TYPE = "REMOTE";
+private Map> exceptionsMap = new HashMap>();
+
+public ExceptionMapper(Class iType) {
+introspectTypeForExceptions(iType);
+}
+
+public Throwable mapException(Method m, Throwable ex) throws Throwable {
+Throwable cause = ex.getCause() == null ? ex : ex.getCause();
+Set excTypes = exceptionsMap.get(m);
+if (excTypes != null) {
+for (Class type : excTypes) {
+if (type.isAssignableFrom(ex.getClass())) {
+return ex;
+}
+if (type.isAssignableFrom(cause.getClass())) {
+return cause;
+}
+}
+}
+return new ServiceException(REMOTE_EXCEPTION_TYPE, ex);
+}
+
+private void introspectTypeForExceptions(Class iType) {
+for (Method m : iType.getDeclaredMethods()) {
+addExceptions(m);
+}
+}
+
+private void addExceptions(Method m) {
+for (Class excType : m.getExceptionTypes()) {
+if (Exception.class.isAssignableFrom(excType)) {
+getCurrentExTypes(m).add(excType);
+}
+}
+}
+
+private Set getCurrentExTypes(Method m) {
+Set types = exceptionsMap.get(m);
+if (types == null) {
+types = new HashSet();
+exceptionsMap.put(m, types);
+}
+return types;
+}
+}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/97873bb0/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandler.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandler.java
 
b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandler.java
index 51a1e24..6f9e7e9 100644
--- 
a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandler.java
+++ 
b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandler.java
@@ -23,26 +23,18 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.security.AccessController;
 import 

[2/2] cxf-dosgi git commit: [DOSGI-254] Fix handling of inherited exceptions

[cschneider]

[DOSGI-254] Fix handling of inherited exceptions


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

Branch: refs/heads/master
Commit: 88b51ef4cbd45eabbf47b6e62a3b2eabd5080bc4
Parents: 97873bb
Author: Christian Schneider 
Authored: Tue Jul 11 11:32:15 2017 +0200
Committer: Christian Schneider 
Committed: Tue Jul 11 11:32:15 2017 +0200

--
 .../org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java| 3 +++
 .../cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java  | 7 +--
 2 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/88b51ef4/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java 
b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
index 77c72b2..2e3044b 100644
--- 
a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
+++ 
b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
@@ -54,6 +54,9 @@ public class ExceptionMapper {
 for (Method m : iType.getDeclaredMethods()) {
 addExceptions(m);
 }
+for (Method m : iType.getMethods()) {
+addExceptions(m);
+}
 }
 
 private void addExceptions(Method m) {

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/88b51ef4/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
--
diff --git 
a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
 
b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
index 43a90a7..af31b4d 100644
--- 
a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
+++ 
b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.osgi.framework.ServiceException;
 
 public class ServiceInvocationHandlerTest {
 
@@ -84,11 +83,7 @@ public class ServiceInvocationHandlerTest {
 proxy.throwException2();
 }
 
-/**
- * Shows issue 
https://issues.apache.org/jira/projects/DOSGI/issues/DOSGI-254
- * We would expect an IOexcpetion here
- */
-@Test(expected = ServiceException.class)
+@Test(expected = IOException.class)
 public void testInheritedException() throws IOException {
 MySubService proxy = ProxyFactory.create(new MyServiceImpl(), 
MySubService.class);
 proxy.throwException1();

cxf-dosgi git commit: [DOSGI-254] Make proxyfactory generic. Small fix in test

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 7a5315cbd -> 5b953b2dd


[DOSGI-254] Make proxyfactory generic. Small fix in test


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

Branch: refs/heads/master
Commit: 5b953b2dd983788e61e42673139e3d5d5822671e
Parents: 7a5315c
Author: Christian Schneider 
Authored: Tue Jul 11 11:04:37 2017 +0200
Committer: Christian Schneider 
Committed: Tue Jul 11 11:04:37 2017 +0200

--
 .../org/apache/cxf/dosgi/common/proxy/ProxyFactory.java  | 11 ++-
 .../dosgi/common/proxy/ServiceInvocationHandlerTest.java |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5b953b2d/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ProxyFactory.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ProxyFactory.java 
b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ProxyFactory.java
index ec10f6e..03c2a14 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ProxyFactory.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ProxyFactory.java
@@ -23,10 +23,11 @@ import java.lang.reflect.Proxy;
 public final class ProxyFactory {
 private ProxyFactory() {
 }
-
-public static Object create(Object serviceProxy, Class iType) {
-return Proxy.newProxyInstance(iType.getClassLoader(), new Class[] {
-iType
-}, new ServiceInvocationHandler(serviceProxy, iType));
+
+@SuppressWarnings("unchecked")
+public static  T create(Object serviceProxy, Class iType) {
+Class[] ifaces = new Class[] {iType};
+return (T)Proxy.newProxyInstance(iType.getClassLoader(), ifaces,
+ new 
ServiceInvocationHandler(serviceProxy, iType));
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5b953b2d/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
--
diff --git 
a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
 
b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
index 30cf5a8..43a90a7 100644
--- 
a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
+++ 
b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
@@ -80,7 +80,7 @@ public class ServiceInvocationHandlerTest {
 
 @Test(expected = IOException.class)
 public void testException() throws IOException {
-MySubService proxy = (MySubService)ProxyFactory.create(new 
MyServiceImpl(), MySubService.class);
+MySubService proxy = ProxyFactory.create(new MyServiceImpl(), 
MySubService.class);
 proxy.throwException2();
 }
 
@@ -90,7 +90,7 @@ public class ServiceInvocationHandlerTest {
  */
 @Test(expected = ServiceException.class)
 public void testInheritedException() throws IOException {
-MyBaseService proxy = (MyBaseService)ProxyFactory.create(new 
MyServiceImpl(), MySubService.class);
+MySubService proxy = ProxyFactory.create(new MyServiceImpl(), 
MySubService.class);
 proxy.throwException1();
 }
 

cxf-dosgi git commit: [DOSGI-254] Unit test to show the issue

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 2ce3ed1de -> 7a5315cbd


[DOSGI-254] Unit test to show the issue


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

Branch: refs/heads/master
Commit: 7a5315cbdc8ac751b43e6d5d1f94db24f6fdb2b0
Parents: 2ce3ed1
Author: Christian Schneider 
Authored: Tue Jul 11 10:59:47 2017 +0200
Committer: Christian Schneider 
Committed: Tue Jul 11 10:59:47 2017 +0200

--
 .../cxf/dosgi/common/proxy/MyBaseService.java   | 25 ++
 .../cxf/dosgi/common/proxy/MyServiceImpl.java   | 35 
 .../cxf/dosgi/common/proxy/MySubService.java| 25 ++
 .../proxy/ServiceInvocationHandlerTest.java | 26 +--
 4 files changed, 109 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/7a5315cb/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MyBaseService.java
--
diff --git 
a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MyBaseService.java 
b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MyBaseService.java
new file mode 100644
index 000..b6f9495
--- /dev/null
+++ b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MyBaseService.java
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.dosgi.common.proxy;
+
+import java.io.IOException;
+
+public interface MyBaseService {
+void throwException1() throws IOException;
+}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/7a5315cb/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MyServiceImpl.java
--
diff --git 
a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MyServiceImpl.java 
b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MyServiceImpl.java
new file mode 100644
index 000..60007a9
--- /dev/null
+++ b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MyServiceImpl.java
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.dosgi.common.proxy;
+
+import java.io.IOException;
+
+public class MyServiceImpl implements MySubService {
+
+@Override
+public void throwException1() throws IOException {
+throw new IOException();
+}
+
+@Override
+public void throwException2() throws IOException {
+throw new IOException();
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/7a5315cb/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MySubService.java
--
diff --git 
a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MySubService.java 
b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MySubService.java
new file mode 100644
index 000..5bc74cd
--- /dev/null
+++ b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/MySubService.java
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more 

[1/2] cxf-dosgi git commit: Update javadoc for java 8

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 584283f3b -> 24b298134


Update javadoc for java 8


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

Branch: refs/heads/master
Commit: 82dc00f345a84488a6cd17033502f0867d76ff6d
Parents: 584283f
Author: Christian Schneider 
Authored: Mon Jul 10 15:28:27 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 15:28:27 2017 +0200

--
 parent/pom.xml | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/82dc00f3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2fd7989..09c25a6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -255,6 +255,17 @@
 
 
 
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+2.10.3
+
+true
+true
+UTF-8
+-Xdoclint:none
+
+
 
 
 

[2/2] cxf-dosgi git commit: [maven-release-plugin] prepare release cxf-dosgi-2.2.0

[cschneider]

[maven-release-plugin] prepare release cxf-dosgi-2.2.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/24b29813
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/24b29813
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/24b29813

Branch: refs/heads/master
Commit: 24b29813427e24734a108cd93f8bc0bc8de0f926
Parents: 82dc00f
Author: Christian Schneider 
Authored: Mon Jul 10 15:39:36 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 15:39:36 2017 +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-jackson/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 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 28 files changed, 32 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/common/pom.xml
--
diff --git a/common/pom.xml b/common/pom.xml
index d8d8164..0485a05 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0-SNAPSHOT
+2.2.0
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/decorator/pom.xml
--
diff --git a/decorator/pom.xml b/decorator/pom.xml
index ba3ebf6..4dc93a0 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0-SNAPSHOT
+2.2.0
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/distribution/features/pom.xml
--
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 0cef2e8..71a016e 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.2.0-SNAPSHOT
+2.2.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/distribution/multi-bundle/pom.xml
--
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 633bb08..a91e483 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.2.0-SNAPSHOT
+2.2.0
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index fc6ca57..54b89b8 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.2.0-SNAPSHOT
+2.2.0
 pom
 CXF DOSGi Distribution Parent
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.2.0-SNAPSHOT
+  2.2.0
   ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/distribution/repository/pom.xml
--
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index a72ac6e..bc08ca6 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0-SNAPSHOT
+2.2.0
 ../../parent/pom.xml
 

[cxf-dosgi] Git Push Summary

[cschneider]

Repository: cxf-dosgi
Updated Tags:  refs/tags/cxf-dosgi-2.2.0 [created] 45e408d64

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

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 24b298134 -> 2ce3ed1de


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

Branch: refs/heads/master
Commit: 2ce3ed1deeae18df0ab97c33cd5bd3f9b48df436
Parents: 24b2981
Author: Christian Schneider 
Authored: Mon Jul 10 15:40:44 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 15:40:44 2017 +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-jackson/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 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 28 files changed, 32 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/common/pom.xml
--
diff --git a/common/pom.xml b/common/pom.xml
index 0485a05..1ec2b12 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0
+2.3.0-SNAPSHOT
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/decorator/pom.xml
--
diff --git a/decorator/pom.xml b/decorator/pom.xml
index 4dc93a0..4717212 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0
+2.3.0-SNAPSHOT
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/distribution/features/pom.xml
--
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 71a016e..f985618 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.2.0
+2.3.0-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/distribution/multi-bundle/pom.xml
--
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index a91e483..9844fbb 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.2.0
+2.3.0-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 54b89b8..0370e29 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.2.0
+2.3.0-SNAPSHOT
 pom
 CXF DOSGi Distribution Parent
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.2.0
+  2.3.0-SNAPSHOT
   ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/distribution/repository/pom.xml
--
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index bc08ca6..c6bea15 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 

cxf-dosgi git commit: Update apache parent, remove duplicates

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 5f34bc9e1 -> 584283f3b


Update apache parent, remove duplicates


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

Branch: refs/heads/master
Commit: 584283f3bd40e6ae78d5bf211acc0bca9dec4dad
Parents: 5f34bc9
Author: Christian Schneider 
Authored: Mon Jul 10 15:12:23 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 15:12:23 2017 +0200

--
 parent/pom.xml |  1 +
 pom.xml| 96 +++--
 2 files changed, 28 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/584283f3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ce6811..2fd7989 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,6 +52,7 @@
 1.7.14
 4.8.0
 true
+..
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/584283f3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 720b44a..da39f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,13 @@
 -->
 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
+
+
+org.apache
+apache
+18
+
+
 org.apache.cxf.dosgi
 cxf-dosgi-main
 2.2.0-SNAPSHOT
@@ -29,32 +36,14 @@
 
 
scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git
 
scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git
-  HEAD
-  
+HEAD
+
 
 
 jira
 https://issues.apache.org/jira/browse/DOSGI
 
 
-
-3.0
-
-
-
-
-apache.releases.https
-Apache Release Distribution Repository
-
https://repository.apache.org/service/local/staging/deploy/maven2
-
-
-apache.snapshots.https
-Apache Development Snapshot Repository
-
https://repository.apache.org/content/repositories/snapshots
-false
-
-
-
 2008
 
 
@@ -87,19 +76,6 @@
 
 
 
-
-
-The Apache Software License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0.txt
-repo
-
-
-
-
-The Apache Software Foundation
-http://www.apache.org/
-
-
 
 parent
 decorator
@@ -111,40 +87,24 @@
 itests
 
 
-
-
-release
-
-
-
-
-true
-maven-deploy-plugin
-2.6
-
-
${deploy.altRepository}
-true
-
-
-
-
-maven-gpg-plugin
-1.3
-
-
-
-sign
-
-
-
-
-
-
-
-
-
 
 install
+
+
+
+org.apache.maven.plugins
+maven-source-plugin
+
+
+attach-sources
+
+jar
+
+
+
+
+
+  
 
 
 
@@ -153,12 +113,10 @@
 maven-release-plugin
 2.5.2
 
-false
-clean install
-deploy
--Prelease,deploy
+apache-release
 true
 forked-path
+
cxf-dosgi-@{project.version}
 
 
 

cxf-dosgi git commit: Fix docs

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master be1d9b7ba -> 5f34bc9e1


Fix docs

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

Branch: refs/heads/master
Commit: 5f34bc9e10958118f0b9e2bbae142ff8837a2fd8
Parents: be1d9b7
Author: Christian Schneider 
Authored: Mon Jul 10 12:29:26 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 12:29:26 2017 +0200

--
 samples/rest/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5f34bc9e/samples/rest/README.md
--
diff --git a/samples/rest/README.md b/samples/rest/README.md
index 2a7311b..df7d98a 100644
--- a/samples/rest/README.md
+++ b/samples/rest/README.md
@@ -44,7 +44,7 @@ task:list
 
 The jaxrs sample also creates swagger documentation for the REST endpoint.
 
-[Get the swagger documentation for the jaxrs sample] 
(http://localhost:8181/cxf/tasks/api-docs?url=../swagger.json).
+[Get the swagger documentation for the jaxrs 
sample](http://localhost:8181/cxf/tasks/api-docs?url=../swagger.json).
 
 ### Add logging intent
 

[2/3] cxf-dosgi git commit: Update Felix version

[cschneider]

Update Felix version


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

Branch: refs/heads/master
Commit: ac8a037872eab53ba82d854681837b736171619e
Parents: e9e4434
Author: Christian Schneider 
Authored: Mon Jul 10 12:09:12 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 12:09:12 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/ac8a0378/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c4216d..3ce6811 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -31,7 +31,7 @@
 5.0.0
 1.11.0
 3.1.12
-5.4.0
+5.6.4
 3.4.8
 
1.0.0
 2.6.0

[3/3] cxf-dosgi git commit: [DOSGI-270] Add swagger documentation example

[cschneider]

[DOSGI-270] Add swagger documentation example


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

Branch: refs/heads/master
Commit: be1d9b7ba01baa4528c7b71a843d30050d225830
Parents: ac8a037
Author: Christian Schneider 
Authored: Mon Jul 10 12:15:20 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 12:15:20 2017 +0200

--
 distribution/multi-bundle/pom.xml   |  1 +
 distribution/repository/pom.xml |  3 +++
 .../features/src/main/resources/features.xml|  3 +++
 samples/rest/README.md  |  7 ++-
 .../cxf/dosgi/samples/rest/TaskResource.java| 18 ++--
 samples/rest/impl-jackson/pom.xml   |  4 ++--
 .../samples/rest/impl/TaskResourceImpl.java | 19 +
 samples/rest/impl/pom.xml   | 12 ++-
 .../samples/rest/impl/TaskResourceImpl.java | 22 +++-
 9 files changed, 68 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/distribution/multi-bundle/pom.xml
--
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 58cb4db..633bb08 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -65,6 +65,7 @@
 
mvn:org.apache.cxf.dosgi/cxf-dosgi/${project.version}/xml/features
   
   
+   cxf-rs-description-swagger2
 cxf-dosgi-base
 aries-rsa-discovery-zookeeper
 cxf-dosgi-provider-ws

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/distribution/repository/pom.xml
--
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index 45eb4da..a72ac6e 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -58,4 +58,7 @@
 
 
 
+
+   true
+
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/samples/features/src/main/resources/features.xml
--
diff --git a/samples/features/src/main/resources/features.xml 
b/samples/features/src/main/resources/features.xml
index 58b9c91..6d62713 100644
--- a/samples/features/src/main/resources/features.xml
+++ b/samples/features/src/main/resources/features.xml
@@ -19,6 +19,9 @@
 
 cxf-dosgi-provider-rs
 aries-rsa-discovery-zookeeper-server
+cxf-features-logging
+cxf-rs-description-swagger2
+mvn:org.webjars/swagger-ui/2.2.10-1
 
mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-rest-api/${project.version}
 
mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-rest-impl/${project.version}
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/samples/rest/README.md
--
diff --git a/samples/rest/README.md b/samples/rest/README.md
index eda3e1d..2a7311b 100644
--- a/samples/rest/README.md
+++ b/samples/rest/README.md
@@ -40,13 +40,18 @@ task:add 4 Mytask
 task:list
 ```
 
+### Browse Swagger documentation
+
+The jaxrs sample also creates swagger documentation for the REST endpoint.
+
+[Get the swagger documentation for the jaxrs sample] 
(http://localhost:8181/cxf/tasks/api-docs?url=../swagger.json).
+
 ### Add logging intent
 
 Starting with CXF 3.1.9 the CXF logging feature is exported as an intent by
 default this makes it very easy to add logging to the rest example.
 
 ```
-feature:install cxf-features-logging
 config:property-set -p TaskResource service.exported.intents logging
 endpoint http://localhost:8181/cxf/tasks
 ```

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
--
diff --git 
a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
 
b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
index 2ccedb6..15630f7 100644
--- 
a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
+++ 
b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
@@ -26,22 +26,36 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 
 import io.swagger.annotations.Api;
+import 

[1/3] cxf-dosgi git commit: Fix checkstyle issues

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 8639e4835 -> be1d9b7ba


Fix checkstyle issues

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

Branch: refs/heads/master
Commit: e9e44344ec1e340975e48eca0d76a7b621ff20b5
Parents: 8639e48
Author: Christian Schneider 
Authored: Fri Jul 7 17:08:55 2017 +0200
Committer: Christian Schneider 
Committed: Fri Jul 7 17:08:55 2017 +0200

--
 .../apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/e9e44344/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
--
diff --git 
a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
 
b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
index 400d793..1b4a44d 100644
--- 
a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
+++ 
b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
@@ -145,13 +145,13 @@ public class ServiceDecoratorImplTest extends TestCase {
 }
 
 private void assertDecorate(final Map serviceProps, 
-Map expected, URL ... 
resources) {
+Map expected, URL... 
resources) {
 Map actual = testDecorate(serviceProps, resources);
 assertEquals(expected, actual);
 }
 
 @SuppressWarnings("rawtypes")
-private Map testDecorate(final Map 
serviceProps, URL ... resources) {
+private Map testDecorate(final Map 
serviceProps, URL... resources) {
 Bundle b = createBundleContaining(resources);
 
 ServiceDecoratorImpl sd = new ServiceDecoratorImpl();

[2/3] cxf-dosgi git commit: [DOSGI-269] Update to Aries RSA 1.11.0

[cschneider]

[DOSGI-269] Update to Aries RSA 1.11.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/13a08d12
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/13a08d12
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/13a08d12

Branch: refs/heads/master
Commit: 13a08d12a20815cadd16b8ce23bcc7280c14f12d
Parents: 21fc663
Author: Christian Schneider 
Authored: Fri Jul 7 11:22:28 2017 +0200
Committer: Christian Schneider 
Committed: Fri Jul 7 11:22:28 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/13a08d12/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index db0c6a5..4c4216d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
 
 5.0.0
 5.0.0
-1.10.0
+1.11.0
 3.1.12
 5.4.0
 3.4.8

[1/3] cxf-dosgi git commit: [DOSGI-268] Update to CXF 3.1.12

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master caaacede6 -> 8639e4835


[DOSGI-268] Update to CXF 3.1.12


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

Branch: refs/heads/master
Commit: 21fc6637f9fcb3ba580d63e84d9e26c98f81cbff
Parents: caaaced
Author: Christian Schneider 
Authored: Fri Jul 7 11:20:38 2017 +0200
Committer: Christian Schneider 
Committed: Fri Jul 7 11:20:38 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/21fc6637/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 40b92ab..db0c6a5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
 5.0.0
 5.0.0
 1.10.0
-3.1.11
+3.1.12
 5.4.0
 3.4.8
 
1.0.0

[3/3] cxf-dosgi git commit: Fix checkstyle issues

[cschneider]

Fix checkstyle issues


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

Branch: refs/heads/master
Commit: 8639e483513caa409f5b5ef8b8885d473dc6e7be
Parents: 13a08d1
Author: Christian Schneider 
Authored: Fri Jul 7 12:53:26 2017 +0200
Committer: Christian Schneider 
Committed: Fri Jul 7 12:53:26 2017 +0200

--
 .../java/org/apache/cxf/dosgi/common/util/PropertyHelper.java| 2 +-
 .../dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8639e483/common/src/main/java/org/apache/cxf/dosgi/common/util/PropertyHelper.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/util/PropertyHelper.java 
b/common/src/main/java/org/apache/cxf/dosgi/common/util/PropertyHelper.java
index 6a5c64c..5987ab1 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/util/PropertyHelper.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/util/PropertyHelper.java
@@ -51,7 +51,7 @@ public final class PropertyHelper {
 return value instanceof String ? (String) value : null;
 }
 
-public static String getFirstNonEmptyStringProperty(Map 
dict, String ... keys) {
+public static String getFirstNonEmptyStringProperty(Map 
dict, String... keys) {
 for (String key : keys) {
 String value = getProperty(dict, key);
 if (value != null) {

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8639e483/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
--
diff --git 
a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
 
b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
index 02e93cf..47cec18 100644
--- 
a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
+++ 
b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
@@ -77,12 +77,12 @@ public class RsProviderCustomTest {
 }
 }
 
-private void addIntent(IntentManagerImpl intentManager, String name, 
Object ... intents) {
+private void addIntent(IntentManagerImpl intentManager, String name, 
Object... intents) {
 Callable provider = intentProvider(intents);
 intentManager.addIntent(provider, name);
 }
 
-private Callable intentProvider(final Object ... intents) {
+private Callable intentProvider(final Object... intents) {
 return new Callable() {
 
 @Override

cxf git commit: [CXF-7414] Fix compile for jdk7

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 3dfbf3062 -> 8fe542285


[CXF-7414] Fix compile for jdk7


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

Branch: refs/heads/master
Commit: 8fe5422852cad92e975b9bb334d0d8c4eb08c304
Parents: 3dfbf30
Author: Christian Schneider 
Authored: Tue Jun 20 08:57:46 2017 +0200
Committer: Christian Schneider 
Committed: Tue Jun 20 08:57:46 2017 +0200

--
 .../org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8fe54228/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
--
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
index 9068de4..5fe933f 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
@@ -250,7 +250,7 @@ public class DeliveryAssuranceOnewayTest extends 
AbstractBusClientServerTestBase
 int num = 1;
 greeter.greetMe(Integer.toString(num++));
 for (int c = 2; c <= numMessages; c++) {
-int currentNum = num++;
+final int currentNum = num++;
 Thread.sleep(100);
 executor.submit(new Runnable() {
 

cxf git commit: [CXF-7414] Fix compile for jdk7

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 78042fae0 -> 545a0d7ae


[CXF-7414] Fix compile for jdk7


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

Branch: refs/heads/3.1.x-fixes
Commit: 545a0d7ae1ba7351acdd71ee691486ad62a45a22
Parents: 78042fa
Author: Christian Schneider 
Authored: Tue Jun 20 08:57:46 2017 +0200
Committer: Christian Schneider 
Committed: Tue Jun 20 08:58:07 2017 +0200

--
 .../org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/545a0d7a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
--
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
index 6fd8f7b..dcce266 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
@@ -250,7 +250,7 @@ public class DeliveryAssuranceOnewayTest extends 
AbstractBusClientServerTestBase
 int num = 1;
 greeter.greetMe(Integer.toString(num++));
 for (int c = 2; c <= numMessages; c++) {
-int currentNum = num++;
+final int currentNum = num++;
 Thread.sleep(100);
 executor.submit(new Runnable() {
 

[3/3] cxf git commit: [CXF-7414] Test and fix for ws-rm out of order issue. Thanks to Dan

[cschneider]

[CXF-7414] Test and fix for ws-rm out of order issue. Thanks to Dan


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

Branch: refs/heads/3.1.x-fixes
Commit: 0a6ff4cb91bbb950f66af9d95511ffcb5ee9d9fb
Parents: 35ae5ea
Author: Christian Schneider 
Authored: Mon Jun 19 17:34:19 2017 +0200
Committer: Christian Schneider 
Committed: Tue Jun 20 08:37:52 2017 +0200

--
 .../apache/cxf/ws/rm/DestinationSequence.java   |  5 +-
 .../ws/rm/DeliveryAssuranceOnewayTest.java  | 40 +++
 .../ws/rm/SingleMessageDelaySimulator.java  | 75 
 .../cxf/systest/ws/rm/atleastonce-inorder.xml   | 40 +++
 4 files changed, 157 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0a6ff4cb/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
index d186194..87c7ecb 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
@@ -397,9 +397,8 @@ public class DestinationSequence extends AbstractSequence {
 }
 }
 synchronized void wakeupAll() {
-while (!continuations.isEmpty()) {
-Continuation c = continuations.remove(0);
-c.resume();
+if (!continuations.isEmpty()) {
+continuations.remove(0).resume();
 }
 notifyAll();
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/0a6ff4cb/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
--
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
index ee9b45f..6fd8f7b 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
@@ -25,7 +25,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
 import javax.jws.WebService;
@@ -236,6 +238,44 @@ public class DeliveryAssuranceOnewayTest extends 
AbstractBusClientServerTestBase
 assertTrue("Message out of order", argNum < callArgs.length);
 }
 }
+
+@Test
+public void testOnewayAtLeastOnceInOrderDelay() throws Exception {
+int numMessages = 4;
+init("org/apache/cxf/systest/ws/rm/atleastonce-inorder.xml", null);
+ExecutorService executor = Executors.newFixedThreadPool(10);
+SingleMessageDelaySimulator sps = new SingleMessageDelaySimulator();
+sps.setDelay(600L);
+greeterBus.getOutInterceptors().add(sps);
+int num = 1;
+greeter.greetMe(Integer.toString(num++));
+for (int c = 2; c <= numMessages; c++) {
+int currentNum = num++;
+Thread.sleep(100);
+executor.submit(new Runnable() {
+
+@Override
+public void run() {
+greeter.greetMe(Integer.toString(currentNum));
+}
+});
+}
+executor.shutdown();
+executor.awaitTermination(10, TimeUnit.SECONDS);
+LOG.info("Waiting for " + numMessages + " messages to arrive");
+awaitMessages(numMessages, 1000, 1);
+List actualArgs = GreeterProvider.CALL_ARGS;
+assertEquals("Some messages were not received", numMessages, 
actualArgs.size());
+assertInOrder(actualArgs);
+}
+
+private void assertInOrder(List actualArgs) {
+int argNum = 0;
+for (String actual : actualArgs) {
+argNum++;
+assertEquals(Integer.toString(argNum), actual);
+}
+}
 
 @Test
 public void testAtMostOnceInOrder() throws Exception {

http://git-wip-us.apache.org/repos/asf/cxf/blob/0a6ff4cb/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SingleMessageDelaySimulator.java
--
diff --git 

[2/3] cxf git commit: [CXF-7414] More updates to resume the "next" message instead of whichever was first in teh continuation list

[cschneider]

[CXF-7414] More updates to resume the "next" message instead of whichever was 
first in teh continuation list


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

Branch: refs/heads/3.1.x-fixes
Commit: b80933704fdd12e9e7c872f9ffbae2d554b2b18d
Parents: 0a6ff4c
Author: Daniel Kulp 
Authored: Mon Jun 19 11:49:03 2017 -0400
Committer: Christian Schneider 
Committed: Tue Jun 20 08:37:52 2017 +0200

--
 .../apache/cxf/ws/rm/DestinationSequence.java   | 29 ++--
 1 file changed, 21 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b8093370/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
index 87c7ecb..7ac5128 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
@@ -24,10 +24,11 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.TimerTask;
+import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -67,7 +68,8 @@ public class DestinationSequence extends AbstractSequence {
 private volatile long inProcessNumber;
 private volatile long highNumberCompleted;
 private long nextInOrder;
-private List continuations = new LinkedList();
+//be careful, must be used in sync block
+private Map continuations = new TreeMap();
 // this map is used for robust and redelivery tracking. for redelivery it 
holds the beingDeliverd messages
 private Set deliveringMessageNumbers = new HashSet();
 
@@ -383,7 +385,7 @@ public class DestinationSequence extends AbstractSequence {
 if (continuation != null) {
 continuation.setObject(message);
 if (continuation.suspend(-1)) {
-continuations.add(continuation);
+continuations.put(mn, continuation);
 throw new SuspendedInvocationException();
 }
 }
@@ -396,17 +398,28 @@ public class DestinationSequence extends AbstractSequence 
{
 }
 }
 }
-synchronized void wakeupAll() {
-if (!continuations.isEmpty()) {
-continuations.remove(0).resume();
+synchronized void wakeupNext(long i) {
+try {
+Continuation c = continuations.remove(i + 1);
+if (c != null) {
+//next was found, don't resume everything, just the next one
+c.resume();
+return;
+}
+//next wasn't found, just resume whatever is first...
+for (Map.Entry entry : 
continuations.entrySet()) {
+entry.getValue().resume();
+return;
+}
+} finally {
+notifyAll();
 }
-notifyAll();
 }
 
 synchronized void processingComplete(long mn) {
 inProcessNumber = 0;
 highNumberCompleted = mn;
-wakeupAll();
+wakeupNext(mn);
 }
 
 void purgeAcknowledged(long messageNr) {

[1/3] cxf git commit: [CXF-7414] Don't resume if we know it's not the next message

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 35ae5ea6c -> 78042fae0


[CXF-7414] Don't resume if we know it's not the next message


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

Branch: refs/heads/3.1.x-fixes
Commit: 78042fae046a7b32ffbe2c16ef2eb72f3c28bfc6
Parents: b809337
Author: Daniel Kulp 
Authored: Mon Jun 19 21:55:43 2017 -0400
Committer: Christian Schneider 
Committed: Tue Jun 20 08:37:52 2017 +0200

--
 .../main/java/org/apache/cxf/ws/rm/DestinationSequence.java| 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/78042fae/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
index 7ac5128..a11eb67 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
@@ -406,11 +406,7 @@ public class DestinationSequence extends AbstractSequence {
 c.resume();
 return;
 }
-//next wasn't found, just resume whatever is first...
-for (Map.Entry entry : 
continuations.entrySet()) {
-entry.getValue().resume();
-return;
-}
+//next wasn't found, nothing to resume, assume it will come in 
later...
 } finally {
 notifyAll();
 }

cxf git commit: [CXF-7414] Test and fix for ws-rm out of order issue. Thanks to Dan

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 6ec6ff5e1 -> f00e87a45


[CXF-7414] Test and fix for ws-rm out of order issue. Thanks to Dan


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

Branch: refs/heads/master
Commit: f00e87a45357dc5a4345576141c8efe376f693aa
Parents: 6ec6ff5
Author: Christian Schneider 
Authored: Mon Jun 19 17:34:19 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jun 19 17:46:04 2017 +0200

--
 .../apache/cxf/ws/rm/DestinationSequence.java   |  5 +-
 .../ws/rm/DeliveryAssuranceOnewayTest.java  | 40 +++
 .../ws/rm/SingleMessageDelaySimulator.java  | 75 
 .../cxf/systest/ws/rm/atleastonce-inorder.xml   | 40 +++
 4 files changed, 157 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f00e87a4/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
index 324719c..c7d5ae3 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
@@ -397,9 +397,8 @@ public class DestinationSequence extends AbstractSequence {
 }
 }
 synchronized void wakeupAll() {
-while (!continuations.isEmpty()) {
-Continuation c = continuations.remove(0);
-c.resume();
+if (!continuations.isEmpty()) {
+continuations.remove(0).resume();
 }
 notifyAll();
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/f00e87a4/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
--
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
index 59249aa..9068de4 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
@@ -25,7 +25,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
 import javax.jws.WebService;
@@ -236,6 +238,44 @@ public class DeliveryAssuranceOnewayTest extends 
AbstractBusClientServerTestBase
 assertTrue("Message out of order", argNum < callArgs.length);
 }
 }
+
+@Test
+public void testOnewayAtLeastOnceInOrderDelay() throws Exception {
+int numMessages = 4;
+init("org/apache/cxf/systest/ws/rm/atleastonce-inorder.xml", null);
+ExecutorService executor = Executors.newFixedThreadPool(10);
+SingleMessageDelaySimulator sps = new SingleMessageDelaySimulator();
+sps.setDelay(600L);
+greeterBus.getOutInterceptors().add(sps);
+int num = 1;
+greeter.greetMe(Integer.toString(num++));
+for (int c = 2; c <= numMessages; c++) {
+int currentNum = num++;
+Thread.sleep(100);
+executor.submit(new Runnable() {
+
+@Override
+public void run() {
+greeter.greetMe(Integer.toString(currentNum));
+}
+});
+}
+executor.shutdown();
+executor.awaitTermination(10, TimeUnit.SECONDS);
+LOG.info("Waiting for " + numMessages + " messages to arrive");
+awaitMessages(numMessages, 1000, 1);
+List actualArgs = GreeterProvider.CALL_ARGS;
+assertEquals("Some messages were not received", numMessages, 
actualArgs.size());
+assertInOrder(actualArgs);
+}
+
+private void assertInOrder(List actualArgs) {
+int argNum = 0;
+for (String actual : actualArgs) {
+argNum++;
+assertEquals(Integer.toString(argNum), actual);
+}
+}
 
 @Test
 public void testAtMostOnceInOrder() throws Exception {

http://git-wip-us.apache.org/repos/asf/cxf/blob/f00e87a4/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SingleMessageDelaySimulator.java
--
diff --git 

cxf-dosgi git commit: Fix description

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 640516eac -> caaacede6


Fix description


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

Branch: refs/heads/master
Commit: caaacede656160fb2840b21e50558141f552463c
Parents: 640516e
Author: Christian Schneider 
Authored: Mon Jun 12 11:30:17 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jun 12 11:30:17 2017 +0200

--
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/caaacede/Readme.md
--
diff --git a/Readme.md b/Readme.md
index c624b8d..16ff485 100644
--- a/Readme.md
+++ b/Readme.md
@@ -16,8 +16,8 @@ CXF DOSGi allows to easily publish and consume SOAP and REST 
services without us
 
 ## Intents
 
-A service can list the named intents it requires. It will then only be 
exported / imported 
-once all the intents are available. This allows for example security 
restrictions or logging.
+Intents allow a service to leverage CXF extensions like features. A service 
can list the named intents it requires. 
+It will then only be exported / imported once all the intents are available. 
This allows for example security restrictions or logging.
 For more informations see [common module](common).
 
 ## Build

cxf-dosgi git commit: Fix typo

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master b647637a9 -> 640516eac


Fix typo


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

Branch: refs/heads/master
Commit: 640516eac9c7efa1237b37842db143c55bea970d
Parents: b647637
Author: Christian Schneider 
Authored: Mon Jun 12 11:26:38 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jun 12 11:26:38 2017 +0200

--
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/640516ea/Readme.md
--
diff --git a/Readme.md b/Readme.md
index 25774ac..c624b8d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -11,8 +11,8 @@ CXF DOSGi allows to easily publish and consume SOAP and REST 
services without us
 * [provider-rs - REST transport](provider-rs)
 * [decorator - Support for exporting existing services](decorator)
 
-* [Examples](samples).
-* [Distributions](distribution).
+* [Examples](samples)
+* [Distributions](distribution)
 
 ## Intents
 

cxf-dosgi git commit: Fix provider-rs readme

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 17e1c64dd -> b647637a9


Fix provider-rs readme


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

Branch: refs/heads/master
Commit: b647637a99c8105ae2f75ca98d092135008b871f
Parents: 17e1c64
Author: Christian Schneider 
Authored: Mon Jun 12 11:25:35 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jun 12 11:25:35 2017 +0200

--
 provider-rs/Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/b647637a/provider-rs/Readme.md
--
diff --git a/provider-rs/Readme.md b/provider-rs/Readme.md
index 843f060..4a562a3 100644
--- a/provider-rs/Readme.md
+++ b/provider-rs/Readme.md
@@ -14,4 +14,4 @@ REST based transport for Aries RSA. The exported service must 
be annotated with
 
 # Sample
 
-See sample greeter-rest
+See [sample rest](../samples/rest).

cxf-dosgi git commit: Fix provider-ws readme

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master e19390dd4 -> 17e1c64dd


Fix provider-ws readme


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

Branch: refs/heads/master
Commit: 17e1c64dd8a8253e092a55df869d126136b25e87
Parents: e19390d
Author: Christian Schneider 
Authored: Mon Jun 12 11:23:49 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jun 12 11:23:49 2017 +0200

--
 provider-ws/Readme.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/17e1c64d/provider-ws/Readme.md
--
diff --git a/provider-ws/Readme.md b/provider-ws/Readme.md
index 14547c6..874d270 100644
--- a/provider-ws/Readme.md
+++ b/provider-ws/Readme.md
@@ -19,7 +19,7 @@ then JAX-WS mode is used else simple mode is used.
 ## Simple
 
 This mode uses the CXF simple frontend and the Aegis Databinding. It can 
export almost any service but is not much configureable. Aegis is also not very 
popular anymore. So this
-mode is more for exporting existing services and small tests.
+mode for exporting existing services and small tests. For most cases the 
JAX-WS mode is recommended.
 
 ## JAX-WS
 
@@ -28,4 +28,5 @@ the CXF JAX-WS frontend and the JAXB databinding. It can be 
customized using the
 
 # Samples
 
-See sample greeter
+See [sample soap](../samples/soap).
+

cxf-dosgi git commit: Fix readme links

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 691014f89 -> e19390dd4


Fix readme links


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

Branch: refs/heads/master
Commit: e19390dd451b1ac3d66450a0206682a63f9e2eed
Parents: 691014f
Author: Christian Schneider 
Authored: Mon Jun 12 11:20:37 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jun 12 11:20:37 2017 +0200

--
 Readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/e19390dd/Readme.md
--
diff --git a/Readme.md b/Readme.md
index 5e024f7..25774ac 100644
--- a/Readme.md
+++ b/Readme.md
@@ -7,9 +7,9 @@ CXF DOSGi allows to easily publish and consume SOAP and REST 
services without us
 ## Modules
 
 * [common - Common services like intents and HTTPService support](common).
-* [provider-ws - SOAP transport] (provider-ws) 
-* [provider-rs - REST transport] (provider-rs)
-* [decorator - Support for exporting existing services] (decorator)
+* [provider-ws - SOAP transport](provider-ws) 
+* [provider-rs - REST transport](provider-rs)
+* [decorator - Support for exporting existing services](decorator)
 
 * [Examples](samples).
 * [Distributions](distribution).

cxf git commit: Also use derby for driver tests

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 4b23cab79 -> 1cee25961


Also use derby for driver tests


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

Branch: refs/heads/master
Commit: 1cee25961124d75cb59610f05fca2be498c000a6
Parents: 4b23cab
Author: Christian Schneider 
Authored: Thu May 25 22:39:41 2017 +0200
Committer: Christian Schneider 
Committed: Thu May 25 22:39:41 2017 +0200

--
 rt/ws/rm/pom.xml  | 5 +
 .../java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java | 4 
 .../ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java| 7 ---
 .../org/apache/cxf/ws/rm/persistence/jdbc/txstore-bean.xml| 4 +++-
 .../cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean.xml  | 4 ++--
 .../cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean2.xml | 5 -
 6 files changed, 22 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1cee2596/rt/ws/rm/pom.xml
--
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 1746f3d..1e05711 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -138,6 +138,11 @@
 test
 
 
+org.slf4j
+slf4j-jdk14
+test
+
+
org.apache.derby
derby
test

http://git-wip-us.apache.org/repos/asf/cxf/blob/1cee2596/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
index a3c35a1..0590387 100644
--- 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
+++ 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
@@ -834,6 +834,10 @@ public class RMTxStore implements RMStore {
 
 protected void createTables() throws SQLException {
 Connection con = verifyConnection();
+if (con == null) {
+LOG.warning("Skip creating tables as we have no connection.");
+return;
+}
 Statement stmt = null;
 
 try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/1cee2596/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
--
diff --git 
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
 
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
index 11f2ecb..c66e67a 100644
--- 
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
+++ 
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
@@ -41,11 +41,11 @@ public class RMTxStoreConfigurationTest extends Assert {
 assertNotNull(manager);
 RMTxStore store = (RMTxStore)manager.getStore();
 assertNotNull(store);
-assertNull("Connection should be null", store.getConnection());
-assertEquals("org.apache.derby.jdbc.NoDriver", 
store.getDriverClassName());
+assertNotNull("Connection should be null", store.getConnection());
+assertEquals("org.apache.derby.jdbc.EmbeddedDriver", 
store.getDriverClassName());
 assertEquals("scott", store.getUserName());
 assertEquals("tiger", store.getPassword());
-assertEquals("jdbc:derby://localhost:1527/rmdb;create=true", 
store.getUrl());
+assertEquals("jdbc:derby:target/wsrmdb3;create=true", store.getUrl());
 assertNull("schema should be unset", store.getSchemaName());
 }
 
@@ -64,6 +64,7 @@ public class RMTxStoreConfigurationTest extends Assert {
 
 @Test
 public void testSetCustomTableExistsState2() {
+RMTxStore.deleteDatabaseFiles("target/wsrmdb5", true);
 SpringBusFactory factory = new SpringBusFactory();
 Bus bus = 
factory.createBus("org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean2.xml");
 RMManager manager = bus.getExtension(RMManager.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/1cee2596/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-bean.xml
--
diff --git 
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-bean.xml 

cxf git commit: Improve RMTXStore by using a real derby DataSource

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 35ab874f8 -> 4b23cab79


Improve RMTXStore by using a real derby DataSource


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

Branch: refs/heads/master
Commit: 4b23cab79851b073d9902e504081c13db31145cb
Parents: 35ab874
Author: Christian Schneider 
Authored: Thu May 25 22:13:56 2017 +0200
Committer: Christian Schneider 
Committed: Thu May 25 22:14:16 2017 +0200

--
 .gitignore  |  1 +
 rt/ws/rm/pom.xml|  5 +++
 .../jdbc/RMTxStoreConfigurationTest.java| 46 +---
 .../ws/rm/persistence/jdbc/txstore-ds-bean.xml  |  7 ++-
 .../ws/rm/persistence/jdbc/txstore-ds-bean2.xml |  5 ++-
 5 files changed, 17 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4b23cab7/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 14e79f9..86a086e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ target/
 velocity.log
 bin/
 node_modules/
+derby.log

http://git-wip-us.apache.org/repos/asf/cxf/blob/4b23cab7/rt/ws/rm/pom.xml
--
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index c512449..1746f3d 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -137,6 +137,11 @@
 jcl-over-slf4j
 test
 
+
+   org.apache.derby
+   derby
+   test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4b23cab7/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
--
diff --git 
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
 
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
index 308d059..11f2ecb 100644
--- 
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
+++ 
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
@@ -19,12 +19,7 @@
 
 package org.apache.cxf.ws.rm.persistence.jdbc;
 
-import java.io.PrintWriter;
-import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.logging.Logger;
-
-import javax.sql.DataSource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -90,7 +85,7 @@ public class RMTxStoreConfigurationTest extends Assert {
 
 assertNotNull(store.getDataSource());
 
-assertNull(store.getConnection());
+assertNotNull(store.getConnection());
 }
 
 @Test
@@ -103,44 +98,7 @@ public class RMTxStoreConfigurationTest extends Assert {
 
 assertNotNull(store.getDataSource());
 
-assertNull(store.getConnection());
+assertNotNull(store.getConnection());
 }
 
-static class TestDataSource implements DataSource {
-public PrintWriter getLogWriter() throws SQLException {
-return null;
-}
-
-public void setLogWriter(PrintWriter out) throws SQLException {
-}
-
-public void setLoginTimeout(int seconds) throws SQLException {
-}
-
-public int getLoginTimeout() throws SQLException {
-return 0;
-}
-
-public  T unwrap(Class iface) throws SQLException {
-return null;
-}
-
-public boolean isWrapperFor(Class iface) throws SQLException {
-return false;
-}
-
-public Connection getConnection() throws SQLException {
-// avoid creating a connection and tables at RMTxStore.init()
-throw new SQLException("test");
-}
-
-public Connection getConnection(String username, String password) 
throws SQLException {
-// avoid creating a connection and tables at RMTxStore.init()
-throw new SQLException("test");
-}
-
-public Logger getParentLogger() {
-return null;
-}
-}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/4b23cab7/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean.xml
--
diff --git 
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean.xml
 
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean.xml
index 9fe6b50..1f58f45 100644
--- 

cxf git commit: [CXF-7344] Also support CXF Content-Type as valid jms property

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 3e18bc283 -> ed512e646


[CXF-7344] Also support CXF Content-Type as valid jms property


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

Branch: refs/heads/master
Commit: ed512e646cfac342bdc2b6df117e9a81eacf4061
Parents: 3e18bc2
Author: Christian Schneider 
Authored: Tue May 9 16:26:57 2017 +0200
Committer: Christian Schneider 
Committed: Tue May 9 16:30:22 2017 +0200

--
 .../src/main/java/org/apache/cxf/transport/jms/JMSConstants.java  | 2 ++
 .../java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java  | 3 +++
 .../main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java   | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ed512e64/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
index 63fe389..c981630 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
@@ -74,6 +74,8 @@ public final class JMSConstants {
 public static final String JMS_MESSAGE_TYPE = "JMSMessageType";
 public static final String TARGET_SERVICE_IN_REQUESTURI = 
"target.service.inrequesturi";
 public static final String MALFORMED_REQUESTURI = "malformed.requesturi";
+
+public static final String RS_CONTENT_TYPE = 
"org.apache.cxf.jms.rs.ContentType";
 
 private JMSConstants() {
 //utility class

http://git-wip-us.apache.org/repos/asf/cxf/blob/ed512e64/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 51499ec..17a2a51 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
@@ -321,6 +321,9 @@ public class JMSMessageHeadersType {
 contentType = 
(String)getProperty(JMSSpecConstants.CONTENTTYPE_FIELD);
 }
 if (contentType == null) {
+contentType = (String)getProperty(JMSConstants.RS_CONTENT_TYPE);
+}
+if (contentType == null) {
 contentType = 
(String)getProperty(org.apache.cxf.message.Message.CONTENT_TYPE);
 }
 return contentType;

http://git-wip-us.apache.org/repos/asf/cxf/blob/ed512e64/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index d599294..f7c8e7e 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -254,7 +254,7 @@ final class JMSMessageUtils {
 }
 addJMSPropertyFromMessage(messageHeaders,
   outMessage,
-  
org.apache.cxf.message.Message.CONTENT_TYPE);
+  JMSConstants.RS_CONTENT_TYPE);
 }
 if (headers != null) {
 for (Map.Entry ent : headers.entrySet()) {

cxf-dosgi git commit: [DOSGI-266] Support for ContextProvider

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 87ead40c8 -> 691014f89


[DOSGI-266] Support for ContextProvider


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

Branch: refs/heads/master
Commit: 691014f8918af1564003923237c206652df1dfd7
Parents: 87ead40
Author: Christian Schneider 
Authored: Mon May 8 17:44:22 2017 +0200
Committer: Christian Schneider 
Committed: Mon May 8 17:44:22 2017 +0200

--
 provider-rs/pom.xml| 6 ++
 .../org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/691014f8/provider-rs/pom.xml
--
diff --git a/provider-rs/pom.xml b/provider-rs/pom.xml
index e60fee3..a1852d6 100644
--- a/provider-rs/pom.xml
+++ b/provider-rs/pom.xml
@@ -70,6 +70,12 @@
 ${cxf.version}
 test
 
+ 
+   org.apache.cxf
+   cxf-rt-rs-extension-search
+   ${cxf.version}
+   test
+   
 
 org.slf4j
 slf4j-jdk14

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/691014f8/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 1ba2dde..975c97f 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
@@ -50,6 +50,7 @@ import org.apache.cxf.feature.Feature;
 import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
+import org.apache.cxf.jaxrs.ext.ContextProvider;
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Component;
@@ -175,7 +176,8 @@ public class RsProvider extends BaseDistributionProvider 
implements Distribution
 return (intent instanceof ExceptionMapper) // 
 || (intent instanceof MessageBodyReader) //
 || (intent instanceof MessageBodyWriter) //
-|| (intent instanceof ContextResolver);
+|| (intent instanceof ContextResolver) //
+|| (intent instanceof ContextProvider); 
 }
 
 private Endpoint createServerFromFactory(JAXRSServerFactoryBean factory,

cxf git commit: Update and improve error reporting in felix tests

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 9cb53caf8 -> c91f436fa


Update and improve error reporting in felix tests


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

Branch: refs/heads/master
Commit: c91f436fab0356e8f1341890805f157c707d921d
Parents: 9cb53ca
Author: Christian Schneider 
Authored: Mon May 8 11:30:43 2017 +0200
Committer: Christian Schneider 
Committed: Mon May 8 11:30:43 2017 +0200

--
 osgi/itests-felix/pom.xml   | 16 +---
 .../org/apache/cxf/osgi/itests/OSGiTestSupport.java | 11 +--
 2 files changed, 10 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c91f436f/osgi/itests-felix/pom.xml
--
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 76dc850..cb36cd2 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -28,9 +28,6 @@
 org.apache.cxf.osgi.itests-felix
 Apache CXF :: OSGi :: Integration Tests pure felix
 jar
-
-1.2.8
-
 
 
 org.apache.cxf
@@ -87,11 +84,6 @@
 
 
 
-org.apache.aries.blueprint
-org.apache.aries.blueprint.core
-
-
-
 org.ops4j.pax.exam
 pax-exam-container-native
 ${cxf.pax.exam.version}
@@ -116,26 +108,20 @@
 test
 

-  
 
 org.apache.felix
 org.apache.felix.framework
-4.4.0
+5.6.2
 test
 
-
 
 org.osgi
 org.osgi.core
-4.3.0
 
-
 
 org.osgi
 org.osgi.compendium
-4.3.0
 
-
 
 org.apache.geronimo.specs
 geronimo-atinject_1.0_spec

http://git-wip-us.apache.org/repos/asf/cxf/blob/c91f436f/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
--
diff --git 
a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
 
b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
index 9523faf..12ea5ea 100644
--- 
a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
+++ 
b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
@@ -27,6 +27,7 @@ import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
 
 /**
  *
@@ -38,8 +39,14 @@ public class OSGiTestSupport {
 
 protected void assertBundleStarted(String name) {
 Bundle bundle = findBundleByName(name);
-Assert.assertNotNull("Bundle " + name + " should be installed", 
bundle);
-Assert.assertEquals("Bundle " + name + " should be started", 
Bundle.ACTIVE, bundle.getState());
+Assert.assertNotNull("Bundle " + name + " should be deployed", bundle);
+if (bundle.getState() != Bundle.ACTIVE) {
+try {
+bundle.start();
+} catch (BundleException e) {
+throw new RuntimeException("Bundle " + name + " should be 
started but we get this error", e);
+}
+}
 }
 
 protected Bundle findBundleByName(String symbolicName) {

cxf git commit: Update depends plugin to 1.4.0

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 77df31712 -> 9cb53caf8


Update depends plugin to 1.4.0


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

Branch: refs/heads/master
Commit: 9cb53caf887415c1c025de9e62aa3831b9a6ff8e
Parents: 77df317
Author: Christian Schneider 
Authored: Mon May 8 10:53:43 2017 +0200
Committer: Christian Schneider 
Committed: Mon May 8 10:53:43 2017 +0200

--
 osgi/itests/pom.xml | 15 +++
 parent/pom.xml  |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9cb53caf/osgi/itests/pom.xml
--
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index ed4e0be..85aff83 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -174,21 +174,20 @@
 ${cxf.karaf.version}
 tar.gz
 test
-   
-   
-   *
-   *
-   
-   
+
+
+*
+*
+   
+
 
 
 
 
-
+
 
 org.apache.servicemix.tooling
 depends-maven-plugin
-1.4.0
 
 
 generate-depends-file

http://git-wip-us.apache.org/repos/asf/cxf/blob/9cb53caf/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2de8b2e..6dd0909 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -281,7 +281,7 @@
 
 org.apache.servicemix.tooling
 depends-maven-plugin
-1.3.1
+1.4.0
 
 
 org.apache.maven.plugins

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

[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 

cxf git commit: Refactored OSGi tests

[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

cxf git commit: Extract connection closing

[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: [CXF-7344] Using double underslash as replacement for dot

[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();
 

[2/2] cxf git commit: Refactoring in jms transport to implement properties as map

[cschneider]

Refactoring in jms transport to implement properties as map


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

Branch: refs/heads/master
Commit: 0a4d26766122177fe1a919ae1e00bb1d93712c6f
Parents: 6070dde
Author: Christian Schneider 
Authored: Thu Apr 27 17:07:08 2017 +0200
Committer: Christian Schneider 
Committed: Thu Apr 27 17:14:12 2017 +0200

--
 .../java/demo/jms_greeter/client/Client.java|   6 +-
 .../apache/cxf/transport/jms/JMSConstants.java  |  18 +-
 .../transport/jms/JMSMessageHeadersType.java| 212 +++
 .../cxf/transport/jms/JMSMessageUtils.java  | 255 +--
 .../cxf/transport/jms/JMSPropertyType.java  |  38 +--
 .../transport/jms/spec/JMSSpecConstants.java|   5 +-
 .../cxf/transport/jms/JMSDestinationTest.java   |   3 +-
 .../cxf/systest/jms/JMSClientServerTest.java|  15 +-
 .../cxf/systest/jms/TwoWayJMSImplBase.java  |   3 +-
 .../systest/jms/security/TwoWayJMSImplBase.java |   7 +-
 10 files changed, 255 insertions(+), 307 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0a4d2676/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
--
diff --git 
a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
 
b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
index 8764e2c..717afb4 100644
--- 
a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
+++ 
b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
@@ -31,8 +31,6 @@ import javax.xml.ws.BindingProvider;
 import org.apache.cxf.jms_greeter.JMSGreeterPortType;
 import org.apache.cxf.jms_greeter.JMSGreeterService;
 import org.apache.cxf.transport.jms.JMSMessageHeadersType;
-import org.apache.cxf.transport.jms.JMSPropertyType;
-
 
 public final class Client {
 
@@ -85,7 +83,7 @@ public final class Client {
 JMSMessageHeadersType requestHeader = new JMSMessageHeadersType();
 
requestHeader.setJMSCorrelationID("JMS_QUEUE_SAMPLE_CORRELATION_ID");
 requestHeader.setJMSExpiration(360L);
-requestHeader.getProperty().add(new JMSPropertyType("Test.Prop", 
"mustReturn"));
+requestHeader.putProperty("Test.Prop", "mustReturn");
 requestContext.put("org.apache.cxf.jms.client.request.headers", 
requestHeader);
 //To override the default receive timeout.
 requestContext.put("org.apache.cxf.jms.client.timeout", new 
Long(1000));
@@ -105,7 +103,7 @@ public final class Client {
 }
 
 if 
("JMS_QUEUE_SAMPLE_CORRELATION_ID".equals(responseHdr.getJMSCorrelationID())
-&& responseHdr.getProperty() != null) {
+&& !responseHdr.getPropertyKeys().isEmpty()) {
 System.out.println("Received expected contents in response 
context");
 } else {
 System.out.println("Received wrong contents in response 
context");

http://git-wip-us.apache.org/repos/asf/cxf/blob/0a4d2676/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
index 4d33f74..63fe389 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
@@ -21,43 +21,59 @@ package org.apache.cxf.transport.jms;
 
 public final class JMSConstants {
 
+@Deprecated
 public static final String JMS_CONTENT_TYPE = "SOAPJMS_contentType";
+
+@Deprecated
 public static final String JMS_QUEUE = "queue";
+@Deprecated
 public static final String JMS_TOPIC = "topic";
 
 public static final String TEXT_MESSAGE_TYPE = "text";
 public static final String BINARY_MESSAGE_TYPE = "binary";
 public static final String BYTE_MESSAGE_TYPE = "byte";
 
+@Deprecated
 public static final String JMS_POOLEDSESSION = "jms.pooled.session";
 public static final String JMS_SERVER_REQUEST_HEADERS = 
"org.apache.cxf.jms.server.request.headers";
 public static final String JMS_SERVER_RESPONSE_HEADERS = 
"org.apache.cxf.jms.server.response.headers";
 public static final String 

[1/2] cxf git commit: [CXF-7344] Fix for jms rest problem. Convert dots to underscores

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 6070ddeef -> 7fab62456


[CXF-7344] Fix for jms rest problem. Convert dots to underscores


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

Branch: refs/heads/master
Commit: 7fab6245608119634271e580166120b9c55dce48
Parents: 0a4d267
Author: Christian Schneider 
Authored: Thu Apr 27 17:14:01 2017 +0200
Committer: Christian Schneider 
Committed: Thu Apr 27 17:14:12 2017 +0200

--
 .../transport/jms/JMSMessageHeadersType.java|  7 +-
 .../cxf/transport/jms/JMSHeaderTypeTest.java| 73 
 2 files changed, 79 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7fab6245/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 9fcafba..1325112 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,10 +72,15 @@ public class JMSMessageHeadersType {
 }
 
 public void putProperty(String key, Object value) {
-properties.put(key, value);
+String escapedKey = key.replace(".", "_");
+properties.put(escapedKey, value);
 }
 
 public Object getProperty(String key) {
+String escapedKey = key.replace(".", "_");
+if (properties.containsKey(escapedKey)) {
+return properties.get(escapedKey);
+}
 return properties.get(key);
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/7fab6245/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
new file mode 100644
index 000..2e66b28
--- /dev/null
+++ 
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.transport.jms;
+
+import java.util.Set;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+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";
+
+@Test
+public void testConversionIn() throws JMSException {
+Message message = createMessage();
+
message.setStringProperty(org.apache.cxf.message.Message.RESPONSE_CODE, 
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, 

cxf git commit: Wait for logging message to be logged in RESTLoggingTest

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 5f6cb0745 -> f4d0b2152


Wait for logging message to be logged in RESTLoggingTest


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

Branch: refs/heads/master
Commit: f4d0b2152036c6e57f82d762464f6c96907e0a37
Parents: 5f6cb07
Author: Christian Schneider 
Authored: Wed Apr 26 15:13:40 2017 +0200
Committer: Christian Schneider 
Committed: Wed Apr 26 15:14:12 2017 +0200

--
 parent/pom.xml  |   6 +
 rt/rs/client/pom.xml|   7 +-
 .../jaxrs/client/logging/RESTLoggingTest.java   | 110 +--
 3 files changed, 61 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f4d0b215/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2560100..32ad67d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -748,6 +748,12 @@
 test
 
 
+org.awaitility
+awaitility
+3.0.0-rc3
+test
+
+
 nekohtml
 nekohtml
 1.9.6.2

http://git-wip-us.apache.org/repos/asf/cxf/blob/f4d0b215/rt/rs/client/pom.xml
--
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index 9123d65..d05d13e 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -95,7 +95,7 @@
   1.0-alpha-1
   provided
   true
-
+
 
 org.springframework
 spring-core
@@ -147,6 +147,11 @@
   2.1
   test
 
+
+org.awaitility
+awaitility
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/f4d0b215/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
--
diff --git 
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
 
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
index a742caf..1ec1f9e 100644
--- 
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
+++ 
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.jaxrs.client.logging;
 
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -33,10 +34,12 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.transport.local.LocalTransportFactory;
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.core.Is.is;
+
 public class RESTLoggingTest {
 
 private static final String SERVICE_URI = "local://testrest";
@@ -45,104 +48,89 @@ public class RESTLoggingTest {
 @Test
 public void testSlf4j() throws IOException {
 LoggingFeature loggingFeature = new LoggingFeature();
-Server server = createService(loggingFeature);
+Server server = createService(SERVICE_URI, new TestServiceRest(), 
loggingFeature);
 server.start();
-WebClient client = createClient(loggingFeature);
+WebClient client = createClient(SERVICE_URI, loggingFeature);
 String result = client.get(String.class);
 server.destroy();
 Assert.assertEquals("test1", result);
 }
 
 @Test
-public void testBinary() throws IOException {
+public void testBinary() throws IOException, InterruptedException {
 LoggingFeature loggingFeature = new LoggingFeature();
 TestEventSender sender = new TestEventSender();
 loggingFeature.setSender(sender);
-Server server = createServiceBinary(loggingFeature);
+Server server = createService(SERVICE_URI_BINARY, new 
TestServiceRestBinary(), loggingFeature);
 server.start();
-WebClient client = createClientBinary(loggingFeature);
+WebClient client = createClient(SERVICE_URI_BINARY, loggingFeature);
 client.get(InputStream.class).close();
 loggingFeature.setLogBinary(true);
 client.get(InputStream.class).close();
 client.close();
+List events = sender.getEvents();
+await().until(() -> events.size(), 

cxf git commit: Add empty constructor

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 44b4f1b51 -> 6c6cdd22e


Add empty constructor


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

Branch: refs/heads/master
Commit: 6c6cdd22e3bf46002cdb759d01224032cb0c8308
Parents: 44b4f1b
Author: Christian Schneider 
Authored: Wed Apr 26 09:34:54 2017 +0200
Committer: Christian Schneider 
Committed: Wed Apr 26 09:34:54 2017 +0200

--
 .../main/java/org/apache/cxf/transport/jms/JMSPropertyType.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6c6cdd22/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
index 19426ad..c509a05 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
@@ -25,6 +25,10 @@ public class JMSPropertyType {
 private String name;
 private Object value;
 
+@Deprecated
+public JMSPropertyType() {
+}
+
 public JMSPropertyType(String name, Object value) {
 this.name = name;
 this.value = value;

[1/2] cxf git commit: Improve test setup

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 7298cc60e -> 44b4f1b51


Improve test setup


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

Branch: refs/heads/master
Commit: 048051f3987838eb9fc7e6b50bc80e3e750b6980
Parents: 7298cc6
Author: Christian Schneider 
Authored: Wed Apr 26 09:09:05 2017 +0200
Committer: Christian Schneider 
Committed: Wed Apr 26 09:09:05 2017 +0200

--
 .../osgi/itests/BundlesAndNamespacesTest.java   |  6 +--
 .../cxf/osgi/itests/CXFOSGiTestSupport.java | 39 +---
 2 files changed, 5 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/048051f3/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 a93f745..7a85f43 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,7 @@
 
 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;
@@ -28,11 +28,11 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 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)
 public class BundlesAndNamespacesTest extends CXFOSGiTestSupport {
@@ -56,7 +56,7 @@ public class BundlesAndNamespacesTest extends 
CXFOSGiTestSupport {
 return new Option[]{
 cxfBaseConfig(),
 replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg",
-getConfigFile("/etc/org.ops4j.pax.logging.cfg")),
+ new 
File("src/test/resources/etc/org.ops4j.pax.logging.cfg")),
 features(cxfUrl, "cxf-core", "cxf-jaxws"),
 logLevel(LogLevel.INFO)};
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/048051f3/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 5ebd000..4a5d107 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
@@ -23,11 +23,8 @@ package org.apache.cxf.osgi.itests;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
-import java.net.URL;
-import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -35,13 +32,11 @@ import javax.inject.Inject;
 
 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.ProbeBuilder;
-import org.ops4j.pax.exam.TestProbeBuilder;
 import org.ops4j.pax.exam.options.MavenUrlReference;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
 import org.osgi.framework.Filter;
 import org.osgi.util.tracker.ServiceTracker;
 import static org.ops4j.pax.exam.CoreOptions.composite;
@@ -56,7 +51,6 @@ import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
  *
  */
 public class CXFOSGiTestSupport {
-private static final String MAVEN_DEPENDENCIES_PROPERTIES = 
"/META-INF/maven/dependencies.properties";
 
 @Inject
 protected BundleContext bundleContext;
@@ -69,26 +63,8 @@ public class CXFOSGiTestSupport {
 protected MavenUrlReference cxfUrl;
 protected MavenUrlReference karafUrl;
 
-/**
- * @param probe
- * @return
- */
-@ProbeBuilder
-public TestProbeBuilder 

[2/2] cxf git commit: Fix test and provide backwards compatible setters

[cschneider]

Fix test and provide backwards compatible setters


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

Branch: refs/heads/master
Commit: 44b4f1b51b569ddd7d49cf48d7ab825b7dc798e4
Parents: 048051f
Author: Christian Schneider 
Authored: Wed Apr 26 09:32:32 2017 +0200
Committer: Christian Schneider 
Committed: Wed Apr 26 09:32:32 2017 +0200

--
 .../src/main/java/demo/jms_greeter/client/Client.java |  5 +
 .../org/apache/cxf/transport/jms/JMSPropertyType.java | 10 ++
 2 files changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/44b4f1b5/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
--
diff --git 
a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
 
b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
index 13f2cb2..8764e2c 100644
--- 
a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
+++ 
b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/client/Client.java
@@ -85,10 +85,7 @@ public final class Client {
 JMSMessageHeadersType requestHeader = new JMSMessageHeadersType();
 
requestHeader.setJMSCorrelationID("JMS_QUEUE_SAMPLE_CORRELATION_ID");
 requestHeader.setJMSExpiration(360L);
-JMSPropertyType propType = new JMSPropertyType();
-propType.setName("Test.Prop");
-propType.setValue("mustReturn");
-requestHeader.getProperty().add(propType);
+requestHeader.getProperty().add(new JMSPropertyType("Test.Prop", 
"mustReturn"));
 requestContext.put("org.apache.cxf.jms.client.request.headers", 
requestHeader);
 //To override the default receive timeout.
 requestContext.put("org.apache.cxf.jms.client.timeout", new 
Long(1000));

http://git-wip-us.apache.org/repos/asf/cxf/blob/44b4f1b5/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
index cdaacfb..19426ad 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
@@ -38,6 +38,16 @@ public class JMSPropertyType {
 return value;
 }
 
+@Deprecated
+public void setName(String name) {
+this.name = name;
+}
+
+@Deprecated
+public void setValue(Object value) {
+this.value = value;
+}
+
 public void writeTo(Message jmsMessage) throws JMSException {
 if (value == null) {
 jmsMessage.setStringProperty(name, null);

[4/7] cxf git commit: Cleanup some tests

[cschneider]

Cleanup some tests


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

Branch: refs/heads/master
Commit: 20b73a780e54f3815ab6b8c5f41d052f75745ee1
Parents: bc4cd1e
Author: Christian Schneider 
Authored: Tue Apr 25 12:22:30 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 25 16:10:47 2017 +0200

--
 .../cxf/transport/jms/JMSDestinationTest.java   |  4 +---
 .../cxf/systest/jms/JMSClientServerTest.java|  5 ++---
 .../cxf/systest/jms/TwoWayJMSImplBase.java  | 14 +-
 .../systest/jms/security/TwoWayJMSImplBase.java | 20 +++-
 4 files changed, 11 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/20b73a78/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
--
diff --git 
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
 
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
index 67369d4..1b0b305 100644
--- 
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
+++ 
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
@@ -259,11 +259,9 @@ public class JMSDestinationTest extends AbstractJMSTester {
 final Message outMessage = new MessageImpl();
 setupMessageHeader(outMessage, null);
 
-JMSPropertyType excludeProp = new JMSPropertyType(customPropertyName, 
customPropertyName);
-
 JMSMessageHeadersType headers = (JMSMessageHeadersType)outMessage
 .get(JMSConstants.JMS_CLIENT_REQUEST_HEADERS);
-headers.getProperty().add(excludeProp);
+headers.getProperty().add(new JMSPropertyType(customPropertyName, 
customPropertyName));
 
 final JMSDestination destination = setupJMSDestination(ei);
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/20b73a78/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
--
diff --git 
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
 
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
index 0f7dae6..44b56d8 100644
--- 
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
+++ 
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
@@ -558,9 +558,8 @@ public class JMSClientServerTest extends 
AbstractBusClientServerTestBase {
 JMSMessageHeadersType requestHeader = new JMSMessageHeadersType();
 requestHeader.setJMSCorrelationID("JMS_SAMPLE_CORRELATION_ID");
 requestHeader.setJMSExpiration(360L);
-JMSPropertyType propType = new JMSPropertyType(testReturnPropertyName, 
"mustReturn");
-requestHeader.getProperty().add(propType);
-propType = new JMSPropertyType(testIgnoredPropertyName, 
"mustNotReturn");
+requestHeader.getProperty().add(new 
JMSPropertyType(testReturnPropertyName, "mustReturn"));
+requestHeader.getProperty().add(new 
JMSPropertyType(testIgnoredPropertyName, "mustNotReturn"));
 requestContext.put(JMSConstants.JMS_CLIENT_REQUEST_HEADERS, 
requestHeader);
 
 String greeting = greeter.greetMe("Milestone-");

http://git-wip-us.apache.org/repos/asf/cxf/blob/20b73a78/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/TwoWayJMSImplBase.java
--
diff --git 
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/TwoWayJMSImplBase.java
 
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/TwoWayJMSImplBase.java
index 3787eee..79499e1 100644
--- 
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/TwoWayJMSImplBase.java
+++ 
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/TwoWayJMSImplBase.java
@@ -52,21 +52,9 @@ public class TwoWayJMSImplBase implements HelloWorldPortType 
{
 }
 
 MessageContext mc = wsContext.getMessageContext();
-//JMSMessageHeadersType headers =
-//(JMSMessageHeadersType) 
mc.get(JMSConstants.JMS_SERVER_REQUEST_HEADERS);
-//System.out.println("get the message headers JMSCorrelationID: " + 
headers.getJMSCorrelationID());
-//System.out.println("Reached here :" + me);
-
-// set reply header custom property
-JMSPropertyType testProperty = new JMSPropertyType("Test_Prop", "some 

[5/7] cxf git commit: Move property handling to respective classes

[cschneider]

Move property handling to respective classes


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

Branch: refs/heads/master
Commit: bc4cd1ed8ea06ca7e0a05c5d2ee898bb937b3663
Parents: 62fd990
Author: Christian Schneider 
Authored: Mon Apr 24 18:25:12 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 25 16:10:47 2017 +0200

--
 .../transport/jms/JMSMessageHeadersType.java| 36 
 .../cxf/transport/jms/JMSMessageUtils.java  | 62 +---
 .../cxf/transport/jms/JMSPropertyType.java  | 30 ++
 3 files changed, 67 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bc4cd1ed/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 6224fe8..333f582 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
@@ -21,6 +21,11 @@ package org.apache.cxf.transport.jms;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.jms.JMSException;
+import javax.jms.Message;
+
+import org.apache.cxf.transport.jms.spec.JMSSpecConstants;
+
 //CHECKSTYLE:OFF
 public class JMSMessageHeadersType {
 protected List property;
@@ -289,5 +294,36 @@ public class JMSMessageHeadersType {
 return soapjmsIsFault;
 }
 
+/**
+ * @param jmsMessage
+ * @param messageProperties
+ */
+public void writeTo(Message jmsMessage)
+throws JMSException {
+
+setProp(jmsMessage, JMSSpecConstants.TARGETSERVICE_FIELD, 
soapjmsTargetService);
+setProp(jmsMessage, JMSSpecConstants.BINDINGVERSION_FIELD, 
soapjmsBindingVersion);
+setProp(jmsMessage, JMSSpecConstants.CONTENTTYPE_FIELD, 
soapjmsContentType);
+setProp(jmsMessage, JMSSpecConstants.CONTENTENCODING_FIELD, 
soapjmsContentEncoding);
+setProp(jmsMessage, JMSSpecConstants.SOAPACTION_FIELD, 
soapjmssoapAction);
+setProp(jmsMessage, JMSSpecConstants.REQUESTURI_FIELD, 
soapjmsRequestURI);
+
+if (isSetSOAPJMSIsFault()) {
+jmsMessage.setBooleanProperty(JMSSpecConstants.ISFAULT_FIELD, 
isSOAPJMSIsFault());
+}
+
+if (isSetProperty()) {
+for (JMSPropertyType prop : getProperty()) {
+prop.writeTo(jmsMessage);
+}
+}
+}
+
+private static void setProp(Message jmsMessage, String name, String value) 
throws JMSException {
+if (value != null) {
+jmsMessage.setStringProperty(name, value);
+}
+}
+
 }
 //CHECKSTYLE:ON
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/bc4cd1ed/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index 6ea346a..04a8e6c 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -296,7 +296,7 @@ final class JMSMessageUtils {
 JMSMessageUtils.prepareJMSMessageHeaderProperties(messageProperties, 
outMessage, jmsConfig);
 JMSMessageUtils.prepareJMSMessageProperties(messageProperties, 
outMessage,
 
jmsConfig.getTargetService(), jmsConfig.getRequestURI());
-JMSMessageUtils.setJMSMessageProperties(jmsMessage, messageProperties);
+messageProperties.writeTo(jmsMessage);
 jmsMessage.setJMSCorrelationID(correlationId);
 return jmsMessage;
 }
@@ -313,66 +313,6 @@ final class JMSMessageUtils {
 }
 
 /**
- * @param jmsMessage
- * @param messageProperties
- */
-static void setJMSMessageProperties(Message jmsMessage, 
JMSMessageHeadersType messageProperties)
-throws JMSException {
-
-if (messageProperties == null) {
-return;
-}
-
-setProp(jmsMessage, JMSSpecConstants.TARGETSERVICE_FIELD, 
messageProperties.getSOAPJMSTargetService());
-setProp(jmsMessage, 

[1/7] cxf git commit: Cleanup on OSGi tests

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 7fb37afad -> 9cc3f37d1


Cleanup on OSGi tests


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

Branch: refs/heads/master
Commit: 108dcd6099e86cd2070b5f9bae2b0feb7d5a7524
Parents: 20b73a7
Author: Christian Schneider 
Authored: Tue Apr 25 14:08:35 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 25 16:10:47 2017 +0200

--
 osgi/itests/pom.xml | 97 +++-
 .../osgi/itests/BundlesAndNamespacesTest.java   |  1 +
 .../cxf/osgi/itests/CXFOSGiTestSupport.java | 86 +
 osgi/itests/src/test/resources/log4j.properties |  5 +
 4 files changed, 41 insertions(+), 148 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/108dcd60/osgi/itests/pom.xml
--
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index d4c64db..2349136 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -29,10 +29,8 @@
 Apache CXF :: OSGi :: Integration Tests
 jar
 
-once
 
 
-
 
 org.apache.cxf
 cxf-core
@@ -63,7 +61,11 @@
 cxf-rt-transports-jms
 ${project.version}
 
-
+
+org.apache.activemq
+activemq-client
+
+
 
 
 org.apache.cxf.karaf
@@ -71,6 +73,12 @@
 ${project.version}
 xml
 features
+
+
+*
+*
+   
+
 
 
 org.apache.activemq
@@ -78,6 +86,12 @@
 xml
 ${cxf.activemq.version}
 features
+
+
+*
+*
+   
+
 
 
 
@@ -87,7 +101,7 @@
 
 
 org.apache.karaf.shell
-org.apache.karaf.shell.console
+org.apache.karaf.shell.core
 ${cxf.karaf.version}
 
 
@@ -105,10 +119,12 @@
 
 org.osgi
 org.osgi.core
+4.3.1
 
 
 org.osgi
 org.osgi.compendium
+4.3.1
 
 
 org.apache.geronimo.specs
@@ -122,7 +138,6 @@
 test
 
 
-
 
 org.ops4j.pax.exam
 pax-exam-junit4
@@ -155,6 +170,10 @@
 org.slf4j
 slf4j-api
 
+
+org.slf4j
+slf4j-log4j12
+
 
 
 org.apache.karaf
@@ -162,28 +181,12 @@
 ${cxf.karaf.version}
 tar.gz
 test
-
-
-org.apache.karaf.shell
-org.apache.karaf.shell.dev
-
-
-org.eclipse
-osgi
-
-
-org.eclipse
-org.eclipse.osgi
-
-
-org.apache.karaf
-org.apache.karaf.client
-
-
-org.apache.felix
-org.apache.felix.framework
-
-
+   
+   
+   *
+   *
+   
+   
 
 
 
@@ -192,6 +195,7 @@
 
 org.apache.servicemix.tooling
 depends-maven-plugin
+1.4.0
 
 
 generate-depends-file
@@ -210,46 +214,9 @@
 ${cxf.karaf.version}
 ${maven.repo.local}
 
-false
+true
 
 
 
-
-
-
-
-org.eclipse.m2e
-lifecycle-mapping
-1.0.0
-
-
-
-
-
-
-org.apache.servicemix.tooling
-
-
-depends-maven-plugin
-
- 

[7/7] cxf git commit: Cleanup OSGi tests

[cschneider]

Cleanup OSGi tests


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

Branch: refs/heads/master
Commit: 9cc3f37d15778604463d03e609e09b46bd2b7b5c
Parents: b3c49a3
Author: Christian Schneider 
Authored: Tue Apr 25 17:05:56 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 25 17:05:56 2017 +0200

--
 osgi/itests/pom.xml |   2 -
 .../cxf/osgi/itests/CXFOSGiTestSupport.java | 105 +--
 2 files changed, 5 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9cc3f37d/osgi/itests/pom.xml
--
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 2349136..800d50d 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -119,12 +119,10 @@
 
 org.osgi
 org.osgi.core
-4.3.1
 
 
 org.osgi
 org.osgi.compendium
-4.3.1
 
 
 org.apache.geronimo.specs

http://git-wip-us.apache.org/repos/asf/cxf/blob/9cc3f37d/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 94ae560..5ebd000 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
@@ -21,25 +21,18 @@ package org.apache.cxf.osgi.itests;
 
 
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintStream;
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
 import java.net.URL;
 import java.util.Properties;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
 import org.apache.karaf.features.FeaturesService;
 import org.junit.Assert;
 import org.ops4j.pax.exam.Option;
@@ -64,12 +57,8 @@ import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
  */
 public class CXFOSGiTestSupport {
 private static final String MAVEN_DEPENDENCIES_PROPERTIES = 
"/META-INF/maven/dependencies.properties";
-private static final Long COMMAND_TIMEOUT = 1L;
 
 @Inject
-protected CommandProcessor commandProcessor;
-
-@Inject
 protected BundleContext bundleContext;
 
 @Inject
@@ -123,6 +112,7 @@ public class CXFOSGiTestSupport {
 throw new IllegalStateException(MAVEN_DEPENDENCIES_PROPERTIES + " 
can not be found", t);
 }
 }
+
 /**
  * Create an {@link org.ops4j.pax.exam.Option} for using a .
  *
@@ -144,104 +134,19 @@ public class CXFOSGiTestSupport {
  //DO NOT COMMIT WITH THIS LINE ENABLED!!!
  //KarafDistributionOption.keepRuntimeFolder(),
  //debugConfiguration(), // nor this
-systemProperty("java.awt.headless").value("true"),
+ 
systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
+ systemProperty("java.awt.headless").value("true"),
  when(localRepo != null)
  
.useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
   
"org.ops4j.pax.url.mvn.localRepository",
   localRepo)),
  when(urp != 
null).useOptions(systemProperty("cxf.useRandomFirstPort").value("true")));
 }
+
 protected Option testUtils() {
 return 
mavenBundle().groupId("org.apache.cxf").artifactId("cxf-testutils").versionAsInProject();
 }
 
-/**
- * Executes a shell command and returns output as a String. Commands have 
a default timeout of 10 seconds.
- *
- * @param command
- * @return
- */
-protected String executeCommand(final String command) {
-return executeCommand(command, COMMAND_TIMEOUT, false);
-}
-
-/**
- * Executes a shell command and returns output as a String. 

[3/7] cxf git commit: Small refactoring of JMS property handling

[cschneider]

Small refactoring of JMS property handling


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

Branch: refs/heads/master
Commit: 4a714ebe08842ad898343c55203f6cde4ccebf45
Parents: 7fb37af
Author: Christian Schneider 
Authored: Mon Apr 24 16:38:32 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 25 16:10:47 2017 +0200

--
 .../cxf/transport/jms/JMSMessageUtils.java  | 36 
 .../cxf/transport/jms/JMSPropertyType.java  | 26 --
 .../cxf/transport/jms/JMSDestinationTest.java   |  4 +--
 .../cxf/systest/jms/JMSClientServerTest.java|  8 ++---
 .../cxf/systest/jms/TwoWayJMSImplBase.java  |  4 +--
 .../systest/jms/security/TwoWayJMSImplBase.java |  4 +--
 6 files changed, 26 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4a714ebe/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index 5e82e9c..31ba9f8 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -135,10 +135,7 @@ final class JMSMessageUtils {
 while (enm.hasMoreElements()) {
 String name = enm.nextElement();
 String val = message.getStringProperty(name);
-JMSPropertyType prop = new JMSPropertyType();
-prop.setName(name);
-prop.setValue(val);
-props.add(prop);
+props.add(new JMSPropertyType(name, val));
 
 protHeaders.put(name, Collections.singletonList(val));
 if (name.equals(org.apache.cxf.message.Message.CONTENT_TYPE)
@@ -498,28 +495,25 @@ final class JMSMessageUtils {
 }
 if (headers != null) {
 for (Map.Entry ent : headers.entrySet()) {
-JMSPropertyType prop = asJmsProperty(ent);
+JMSPropertyType prop = asJmsProperty(ent.getKey(), 
ent.getValue());
 messageProperties.getProperty().add(prop);
 }
 }
 }
 
-private static JMSPropertyType asJmsProperty(Map.Entry ent) {
-JMSPropertyType prop = new JMSPropertyType();
-prop.setName(ent.getKey());
-if (ent.getValue().size() > 1) {
-StringBuilder b = new StringBuilder();
-for (String s : ent.getValue()) {
-if (b.length() > 0) {
-b.append(',');
-}
-b.append(s);
+private static JMSPropertyType asJmsProperty(String key, List 
value) {
+return new JMSPropertyType(key, join(value, ','));
+}
+
+private static String join(List valueList, char seperator) {
+StringBuilder b = new StringBuilder();
+for (String s : valueList) {
+if (b.length() > 0) {
+b.append(seperator);
 }
-prop.setValue(b.toString());
-} else {
-prop.setValue(ent.getValue().get(0));
+b.append(s);
 }
-return prop;
+return b.toString();
 }
 
 private static String getSoapAction(JMSMessageHeadersType 
messageProperties,
@@ -558,9 +552,7 @@ final class JMSMessageUtils {
   String key) {
 Object value = message.get(key);
 if (value != null) {
-JMSPropertyType prop = new JMSPropertyType();
-prop.setName(key);
-prop.setValue(value.toString());
+JMSPropertyType prop = new JMSPropertyType(key, value.toString());
 messageProperties.getProperty().add(prop);
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/4a714ebe/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
index 3d9a8f5..36d25dc 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
@@ -19,32 +19,20 @@
 package org.apache.cxf.transport.jms;
 
 public class 

[2/7] cxf git commit: Extract Security Conetext handling

[cschneider]

Extract Security Conetext handling


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

Branch: refs/heads/master
Commit: 62fd990682c0c6ff915356fb9b5f0a32efc20424
Parents: 4a714eb
Author: Christian Schneider 
Authored: Mon Apr 24 17:55:04 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 25 16:10:47 2017 +0200

--
 .../apache/cxf/transport/jms/JMSConduit.java|  2 +-
 .../cxf/transport/jms/JMSDestination.java   |  2 +-
 .../cxf/transport/jms/JMSMessageUtils.java  | 44 
 .../transport/jms/SecurityContextFactory.java   | 75 
 4 files changed, 77 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/62fd9906/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
index e588542..cbf2a6b 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
@@ -436,7 +436,7 @@ public class JMSConduit extends AbstractConduit implements 
JMSExchangeSender, Me
 Message inMessage = JMSMessageUtils.asCXFMessage(jmsMessage,
  
JMSConstants.JMS_CLIENT_RESPONSE_HEADERS);
 if (jmsConfig.isCreateSecurityContext()) {
-SecurityContext securityContext = 
JMSMessageUtils.buildSecurityContext(jmsMessage, jmsConfig);
+SecurityContext securityContext = 
SecurityContextFactory.buildSecurityContext(jmsMessage, jmsConfig);
 inMessage.put(SecurityContext.class, securityContext);
 }
 exchange.setInMessage(inMessage);

http://git-wip-us.apache.org/repos/asf/cxf/blob/62fd9906/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
index 22a94de..3362c35 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
@@ -217,7 +217,7 @@ public class JMSDestination extends 
AbstractMultiplexDestination implements Mess
 + jmsConfig.getTargetDestination());
 Message inMessage = JMSMessageUtils.asCXFMessage(message, 
JMSConstants.JMS_SERVER_REQUEST_HEADERS);
 if (jmsConfig.isCreateSecurityContext()) {
-SecurityContext securityContext = 
JMSMessageUtils.buildSecurityContext(message, jmsConfig);
+SecurityContext securityContext = 
SecurityContextFactory.buildSecurityContext(message, jmsConfig);
 inMessage.put(SecurityContext.class, securityContext);
 }
 inMessage.put(JMSConstants.JMS_SERVER_RESPONSE_HEADERS, new 
JMSMessageHeadersType());

http://git-wip-us.apache.org/repos/asf/cxf/blob/62fd9906/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index 31ba9f8..6ea346a 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -25,7 +25,6 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import java.security.Principal;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -49,7 +48,6 @@ import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.HttpHeaderHelper;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.message.MessageUtils;
-import org.apache.cxf.security.SecurityContext;
 import org.apache.cxf.transport.jms.spec.JMSSpecConstants;
 import org.apache.cxf.transport.jms.uri.JMSEndpoint;
 import org.apache.cxf.transport.jms.util.JMSMessageConverter;
@@ -222,48 +220,6 @@ final class 

[6/7] cxf git commit: Downgrade surefire to fix build issue

[cschneider]

Downgrade surefire to fix build issue


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

Branch: refs/heads/master
Commit: b3c49a34cd86a1966f79aed10c2df54adbdf7c5b
Parents: 108dcd6
Author: Christian Schneider 
Authored: Tue Apr 25 16:08:17 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 25 16:11:04 2017 +0200

--
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b3c49a34/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3fd0c2c..e60c684 100644
--- a/pom.xml
+++ b/pom.xml
@@ -474,7 +474,9 @@
 
 org.apache.maven.plugins
 maven-surefire-plugin
-2.19.1
+
+2.18.1
 
 
 org.apache.maven.plugins

cxf git commit: [CXF-6576] Handle exceptions in MessageListener container without using setExceptionListener

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master 1f430d4c7 -> 40cb28fbc


[CXF-6576] Handle exceptions in MessageListener container without using 
setExceptionListener


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

Branch: refs/heads/master
Commit: 40cb28fbcc2e3d0805f0d3ea90797c1310c3cba5
Parents: 1f430d4
Author: Christian Schneider 
Authored: Fri Apr 21 10:47:16 2017 +0200
Committer: Christian Schneider 
Committed: Fri Apr 21 12:29:55 2017 +0200

--
 rt/transports/jms/pom.xml   |  8 +-
 .../cxf/transport/jms/JMSDestination.java   |  7 +-
 .../util/PollingMessageListenerContainer.java   | 93 +---
 .../transport/jms/util/MessageListenerTest.java | 72 ++-
 4 files changed, 103 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/40cb28fb/rt/transports/jms/pom.xml
--
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index e13c5a6..e6fd9a4 100644
--- a/rt/transports/jms/pom.xml
+++ b/rt/transports/jms/pom.xml
@@ -45,7 +45,6 @@
 
 org.apache.geronimo.specs
 geronimo-jta_1.1_spec
-1.1.1
 
 
 org.apache.geronimo.specs
@@ -64,6 +63,13 @@
 easymock
 test
 
+
+
+   org.awaitility
+   awaitility
+   2.0.0
+   test
+
 
 org.apache.cxf
 cxf-rt-management

http://git-wip-us.apache.org/repos/asf/cxf/blob/40cb28fb/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
index 8ec23cd..22a94de 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
@@ -118,19 +118,20 @@ public class JMSDestination extends 
AbstractMultiplexDestination implements Mess
 Session session = null;
 try {
 connection = JMSFactory.createConnection(jmsConfig);
-connection.setExceptionListener(new ExceptionListener() {
+ExceptionListener exListener = new ExceptionListener() {
 public void onException(JMSException exception) {
 if (!shutdown) {
 LOG.log(Level.WARNING, "Exception on JMS connection. 
Trying to reconnect", exception);
 restartConnection();
 }
 }
-});
+};
 session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
 Destination destination = jmsConfig.getTargetDestination(session);
 
 PollingMessageListenerContainer container = new 
PollingMessageListenerContainer(connection,
-   
 destination, this);
+   
 destination, 
+   
 this, exListener);
 
container.setConcurrentConsumers(jmsConfig.getConcurrentConsumers());
 container.setTransactionManager(jmsConfig.getTransactionManager());
 container.setMessageSelector(jmsConfig.getMessageSelector());

http://git-wip-us.apache.org/repos/asf/cxf/blob/40cb28fb/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index c4276eb..461a2b1 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -23,6 +23,7 @@ import java.util.logging.Logger;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
+import javax.jms.ExceptionListener;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import 

[5/6] cxf git commit: [CXF-6778] Reset correct variable

[cschneider]

[CXF-6778] Reset correct variable


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

Branch: refs/heads/jms-exception-handling
Commit: ba9fa0e7c7067b5e6536307c0cfdcf5154912647
Parents: c0efcaf
Author: Christian Schneider 
Authored: Thu Apr 20 16:56:20 2017 +0200
Committer: Christian Schneider 
Committed: Thu Apr 20 16:56:48 2017 +0200

--
 .../main/java/org/apache/cxf/transport/jms/JMSConfiguration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ba9fa0e7/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
index 8498a65..ec01a39 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
@@ -481,7 +481,7 @@ public class JMSConfiguration {
 
 public void resetCachedReplyDestination() {
 synchronized (this) {
-this.replyDestination = null;
+this.replyDestinationDest = null;
 }
 }
 

[3/6] cxf git commit: Blocking anonymous dynamic client reg even though it is allowed by the spec, generating client sec for other grants which require it

[cschneider]

Blocking anonymous dynamic client reg even though it is allowed by the spec, 
generating client sec for other grants which require it


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

Branch: refs/heads/jms-exception-handling
Commit: ae1842229fbc354e57ca3ca6797e8c9462dfc2ce
Parents: 0b7b183
Author: Sergey Beryozkin 
Authored: Thu Apr 20 15:24:42 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu Apr 20 15:24:42 2017 +0100

--
 .../services/DynamicRegistrationService.java| 38 ++---
 .../oidc/OIDCDynamicRegistrationTest.java   | 58 ++--
 2 files changed, 59 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ae184222/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/DynamicRegistrationService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/DynamicRegistrationService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/DynamicRegistrationService.java
index 7af9993..7f914ec 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/DynamicRegistrationService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/DynamicRegistrationService.java
@@ -56,12 +56,13 @@ public class DynamicRegistrationService {
 private int clientIdSizeInBytes = DEFAULT_CLIENT_ID_SIZE;
 private MessageContext mc;
 private boolean supportRegistrationAccessTokens = true;
+private String userRole;
 
 @POST
 @Consumes("application/json")
 @Produces("application/json")
 public Response register(ClientRegistration request) {
-checkInitialAccessToken();
+checkInitialAuthentication();
 Client client = createNewClient(request);
 createRegAccessToken(client);
 clientProvider.setClient(client);
@@ -69,15 +70,28 @@ public class DynamicRegistrationService {
 return 
Response.status(201).entity(fromClientToRegistrationResponse(client)).build();
 }
 
-protected void checkInitialAccessToken() {
+protected void checkInitialAuthentication() {
 if (initialAccessToken != null) {
 String accessToken = getRequestAccessToken();
 if (!initialAccessToken.equals(accessToken)) {
 throw ExceptionUtils.toNotAuthorizedException(null, null);
 }
+} else {
+checkSecurityContext();
 }
 
 }
+
+
+protected void checkSecurityContext() {
+SecurityContext sc = mc.getSecurityContext();
+if (sc.getUserPrincipal() == null) {
+throw ExceptionUtils.toNotAuthorizedException(null, null);
+}  
+if (userRole != null && !sc.isUserInRole(userRole)) {
+throw ExceptionUtils.toForbiddenException(null, null);
+}
+}
 
 protected String createRegAccessToken(Client client) {
 String regAccessToken = OAuthUtils.generateRandomTokenKey();
@@ -88,7 +102,7 @@ public class DynamicRegistrationService {
 protected void checkRegistrationAccessToken(Client c, String accessToken) {
 String regAccessToken = 
c.getProperties().get(ClientRegistrationResponse.REG_ACCESS_TOKEN);
 
-if (!regAccessToken.equals(accessToken)) {
+if (regAccessToken == null || !regAccessToken.equals(accessToken)) {
 throw ExceptionUtils.toNotAuthorizedException(null, null);
 }
 }
@@ -205,8 +219,12 @@ public class DynamicRegistrationService {
 if (grantTypes == null) {
 grantTypes = Collections.singletonList("authorization_code");
 }
+
+boolean passwordRequired = 
grantTypes.contains(OAuthConstants.AUTHORIZATION_CODE_GRANT)
+   || grantTypes.contains(OAuthConstants.RESOURCE_OWNER_GRANT)
+   || grantTypes.contains(OAuthConstants.CLIENT_CREDENTIALS_GRANT);
 
-// Client Type
+// Application Type
 // https://tools.ietf.org/html/rfc7591 has no this property but
 // but 
http://openid.net/specs/openid-connect-registration-1_0.html#ClientMetadata does
 String appType = request.getApplicationType();
@@ -214,13 +232,12 @@ public class DynamicRegistrationService {
 appType = DEFAULT_APPLICATION_TYPE;
 }
 boolean isConfidential = DEFAULT_APPLICATION_TYPE.equals(appType)
-&& 

[4/6] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

[cschneider]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


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

Branch: refs/heads/jms-exception-handling
Commit: c0efcafeaccad55ef3c2326e7147468edf9dbdd8
Parents: ae18422 a983459
Author: Sergey Beryozkin 
Authored: Thu Apr 20 15:25:08 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu Apr 20 15:25:08 2017 +0100

--
 .../apache/cxf/transport/jms/JMSConduit.java| 22 
 .../cxf/transport/jms/JMSDestination.java   |  4 +---
 2 files changed, 23 insertions(+), 3 deletions(-)
--