from:"ay"

[1/2] cxf git commit: [CXF-6994] Skip RMCaptureInInterceptor processing for GET requests

2016-08-09 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 8c6d7f987 -> d557319d8


[CXF-6994] Skip RMCaptureInInterceptor processing for GET requests


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

Branch: refs/heads/master
Commit: 57d9d556066372fef3cde1589acb570e543b78df
Parents: 7640080
Author: Alessio Soldano 
Authored: Thu Aug 4 18:31:05 2016 +0200
Committer: Alessio Soldano 
Committed: Thu Aug 4 18:31:05 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/57d9d556/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
index 87ae210..9257e81 100755
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
@@ -64,7 +64,7 @@ public class RMCaptureInInterceptor extends 
AbstractRMInterceptor {

 // all messages are initially captured as they cannot be distinguished 
at this phase
 // Non application messages temp files are released 
(cos.releaseTempFileHold()) in RMInInterceptor
-if 
(!MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))
+if (!isGET(message) && 
!MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))
 && (getManager().getStore() != null || 
(getManager().getDestinationPolicy() != null && getManager()
 .getDestinationPolicy().getRetryPolicy() != null))) {

[2/2] cxf git commit: Merge branch 'CXF-6994' of https://github.com/asoldano/cxf This closes #152

2016-08-09 Thread ay

Merge branch 'CXF-6994' of https://github.com/asoldano/cxf
This closes #152


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

Branch: refs/heads/master
Commit: d557319d8bc3bbedf9fdafc3c1b34cadde27c3d8
Parents: 8c6d7f9 57d9d55
Author: Akitoshi Yoshida 
Authored: Tue Aug 9 16:54:39 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Aug 9 16:55:36 2016 +0200

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

cxf git commit: add jax_rs/websocket_osgi in samples/pom.xml

2016-07-28 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes bc3ccc3ab -> fcf585eb1


add jax_rs/websocket_osgi in samples/pom.xml


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

Branch: refs/heads/3.1.x-fixes
Commit: fcf585eb1b260c320281f1a5128307e9ae082547
Parents: bc3ccc3
Author: Akitoshi Yoshida 
Authored: Fri Jul 29 00:05:25 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Jul 29 00:16:20 2016 +0200

--
 .../main/release/samples/jax_rs/websocket_osgi/pom.xml  |  8 
 .../main/release/samples/jax_rs/websocket_web/pom.xml   | 12 ++--
 distribution/src/main/release/samples/pom.xml   |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
index 16e1988..f63bfc1 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 ../..
 
 
@@ -68,17 +68,17 @@
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-websocket
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 javax.ws.rs

http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 7b76bbc..0b57c11 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -20,13 +20,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
 jax_rs_websocket_web
-JAX-RS WebSocket Demo
-JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket Demo
 war
 
 org.apache.cxf.samples
 cxf-samples
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 ../..
 
 
@@ -82,17 +82,17 @@
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-websocket
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 javax.ws.rs

http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index 668792b..88d1ac0 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -51,6 +51,8 @@
 jax_rs/basic_https
 jax_rs/basic
 jax_rs/websocket
+jax_rs/websocket_web
+jax_rs/websocket_osgi
 jax_rs/search
 jax_rs/description_swagger
 jax_rs/description_swagger2

cxf git commit: add jax_rs/websocket_osgi in samples/pom.xml

2016-07-28 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master f5e753380 -> 45d54d558


add jax_rs/websocket_osgi in samples/pom.xml


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

Branch: refs/heads/master
Commit: 45d54d558625236b84752b0d7976f0cf85518c16
Parents: f5e7533
Author: Akitoshi Yoshida 
Authored: Fri Jul 29 00:05:25 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Jul 29 00:06:07 2016 +0200

--
 .../src/main/release/samples/jax_rs/websocket_web/pom.xml| 4 ++--
 distribution/src/main/release/samples/pom.xml| 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45d54d55/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 49c4540..1976690 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -20,8 +20,8 @@
 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
 jax_rs_websocket_web
-JAX-RS WebSocket Demo
-JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket Demo
 war
 
 org.apache.cxf.samples

http://git-wip-us.apache.org/repos/asf/cxf/blob/45d54d55/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index d73a7d0..ca874f3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -52,6 +52,7 @@
 jax_rs/basic
 jax_rs/websocket
 jax_rs/websocket_web
+jax_rs/websocket_osgi
 jax_rs/search
 jax_rs/description_swagger
 jax_rs/description_swagger2

[2/2] cxf git commit: [CXF-4209] Server side message redelivery support for WS-RM

2016-06-30 Thread ay

[CXF-4209] Server side message redelivery support for WS-RM


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

Branch: refs/heads/master
Commit: 6b8a340c7c5d5c6cd24f421d0caeaa368e94891d
Parents: 3a1fa0b
Author: Kai Rommel 
Authored: Tue Jun 7 17:47:58 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Thu Jun 30 11:16:59 2016 +0200

--
 .../java/org/apache/cxf/ws/rm/Destination.java  |  23 +
 .../apache/cxf/ws/rm/DestinationSequence.java   | 100 ++-
 .../org/apache/cxf/ws/rm/ManagedRMEndpoint.java | 192 ++---
 .../cxf/ws/rm/RMCaptureInInterceptor.java   | 227 +-
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  |   1 +
 .../apache/cxf/ws/rm/RMDeliveryInterceptor.java |  12 +
 .../java/org/apache/cxf/ws/rm/RMEndpoint.java   |   3 +
 .../org/apache/cxf/ws/rm/RMInInterceptor.java   |  74 +-
 .../java/org/apache/cxf/ws/rm/RMManager.java|  76 +-
 .../java/org/apache/cxf/ws/rm/RMProperties.java |  18 +
 .../org/apache/cxf/ws/rm/RedeliveryQueue.java   | 106 +++
 .../main/java/org/apache/cxf/ws/rm/Servant.java |   2 +-
 .../org/apache/cxf/ws/rm/feature/RMFeature.java |   4 +-
 .../apache/cxf/ws/rm/persistence/RMMessage.java |   9 +
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java   |  74 +-
 .../cxf/ws/rm/soap/RMSoapInInterceptor.java |   5 +-
 .../cxf/ws/rm/soap/RedeliveryQueueImpl.java | 699 +++
 .../configuration/wsrm-manager-types.xsd|  15 +
 .../schemas/configuration/wsrm-policy.xjb   |   9 +
 .../cxf/ws/rm/DestinationSequenceTest.java  |   4 +-
 .../org/apache/cxf/ws/rm/RMEndpointTest.java|   4 +
 .../apache/cxf/ws/rm/RMInInterceptorTest.java   |  25 +
 .../org/apache/cxf/ws/rm/RMManagerTest.java |  43 +-
 .../rm/persistence/jdbc/RMTxStoreTestBase.java  |   4 +
 .../cxf/systest/ws/rm/RedeliveryTest.java   | 186 +
 25 files changed, 1703 insertions(+), 212 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6b8a340c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
--
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
index 178a63c..3d3489b 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
@@ -75,6 +76,14 @@ public class Destination extends AbstractEndpoint {
 processingSequenceCount.incrementAndGet();
 }
 
+// this method ensures to keep the sequence until all the messages are 
delivered
+public void terminateSequence(DestinationSequence seq) {
+seq.terminate();
+if (seq.allAcknowledgedMessagesDelivered()) {
+removeSequence(seq);
+}
+}
+
 public void removeSequence(DestinationSequence seq) {
 DestinationSequence o;
 o = map.remove(seq.getIdentifier().getValue());
@@ -208,6 +217,20 @@ public class Destination extends AbstractEndpoint {
 long mn = sequenceType.getMessageNumber().longValue();
 seq.processingComplete(mn);
 seq.purgeAcknowledged(mn);
+// remove acknowledged undelivered message
+seq.removeDeliveringMessageNumber(mn);
+if (seq.isTerminated() && seq.allAcknowledgedMessagesDelivered()) {
+removeSequence(seq);
+}
+}
+CachedOutputStream saved = 
(CachedOutputStream)message.remove(RMMessageConstants.SAVED_CONTENT);
+if (saved != null) {
+saved.releaseTempFileHold();
+try {
+saved.close();
+} catch (IOException e) {
+// ignore
+}
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/6b8a340c/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 58b7906..3442fc5 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
@@

[1/2] cxf git commit: [CXF-4209] Server side message redelivery support for WS-RM

2016-06-30 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 3a1fa0b23 -> 6b8a340c7


http://git-wip-us.apache.org/repos/asf/cxf/blob/6b8a340c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
new file mode 100644
index 000..e2ff271
--- /dev/null
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
@@ -0,0 +1,699 @@
+/**
+ * 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.ws.rm.soap;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TimerTask;
+import java.util.TreeSet;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.w3c.dom.Node;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.interceptor.InterceptorChain;
+import org.apache.cxf.interceptor.InterceptorProvider;
+import org.apache.cxf.io.CachedOutputStream;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.phase.PhaseManager;
+import org.apache.cxf.staxutils.StaxSource;
+import org.apache.cxf.ws.rm.DestinationSequence;
+import org.apache.cxf.ws.rm.RMCaptureInInterceptor;
+import org.apache.cxf.ws.rm.RMContextUtils;
+import org.apache.cxf.ws.rm.RMManager;
+import org.apache.cxf.ws.rm.RMMessageConstants;
+import org.apache.cxf.ws.rm.RMProperties;
+import org.apache.cxf.ws.rm.RedeliveryQueue;
+import org.apache.cxf.ws.rm.RetryStatus;
+import org.apache.cxf.ws.rm.manager.RetryPolicyType;
+import org.apache.cxf.ws.rm.persistence.RMStore;
+import org.apache.cxf.ws.rm.v200702.Identifier;
+import org.apache.cxf.ws.rm.v200702.SequenceType;
+
+/**
+ * 
+ */
+public class RedeliveryQueueImpl implements RedeliveryQueue {
+private static final Logger LOG = 
LogUtils.getL7dLogger(RedeliveryQueueImpl.class);
+
+private Map candidates = 
+new HashMap();
+private Map suspendedCandidates = 
+new HashMap();
+
+private RMManager manager;
+
+private int undeliveredCount;
+
+public RedeliveryQueueImpl(RMManager m) {
+manager = m;
+}
+
+public RMManager getManager() {
+return manager;
+}
+
+public void setManager(RMManager m) {
+manager = m;
+}
+
+public void addUndelivered(Message message) {
+cacheUndelivered(message);
+}
+
+/**
+ * @param seq the sequence under consideration
+ * @return the number of undelivered messages for that sequence
+ */
+public synchronized int countUndelivered(DestinationSequence seq) {
+List sequenceCandidates = 
getSequenceCandidates(seq);
+return sequenceCandidates == null ? 0 : sequenceCandidates.size();
+}
+
+public int countUndelivered() {
+return undeliveredCount;
+}
+
+public boolean isEmpty() {
+return 0 == getUndelivered().size();
+}
+public void purgeAll(DestinationSequence seq) {
+Collection purged = new ArrayList();
+synchronized (this) {
+LOG.fine("Start purging redeliver candidates.");
+List sequenceCandidates = 
getSequenceCandidates(seq);
+if (null != sequenceCandidates) {
+for (int i = sequenceCandidates.size() - 1; i >= 0; i--) {
+RedeliverCandidate candidate =

[2/2] cxf git commit: [CXF-6863] WS-RM 3.x fix for retransmission works with attachments upon a network error

2016-06-07 Thread ay

[CXF-6863] WS-RM 3.x fix for retransmission works with attachments upon a 
network error


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

Branch: refs/heads/3.1.x-fixes
Commit: 907fbb7b8b437ebfa902b2daeebf610aa5888bdd
Parents: 27a95f0
Author: Kai Rommel 
Authored: Fri Jun 3 19:13:12 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Jun 7 14:30:22 2016 +0200

--
 .../org/apache/cxf/io/CachedOutputStream.java   | 17 +++-
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  | 10 
 .../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 27 ++--
 3 files changed, 34 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/907fbb7b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
--
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java 
b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
index 905f6f7..eeced83 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
@@ -258,14 +258,17 @@ public class CachedOutputStream extends OutputStream {
 }
 } else {
 // read the file
-currentStream.close();
-if (copyOldContent) {
-InputStream fin = createInputStream(tempFile);
-IOUtils.copyAndCloseInput(fin, out);
+try {
+currentStream.close();
+if (copyOldContent) {
+InputStream fin = createInputStream(tempFile);
+IOUtils.copyAndCloseInput(fin, out);
+}
+} finally {
+streamList.remove(currentStream);
+deleteTempFile();
+inmem = true;
 }
-streamList.remove(currentStream);
-deleteTempFile();
-inmem = true;
 }
 }
 currentStream = out;

http://git-wip-us.apache.org/repos/asf/cxf/blob/907fbb7b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index 4514e03..b3c412d 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.rm;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +42,7 @@ import org.apache.cxf.interceptor.AttachmentOutInterceptor;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.io.CachedOutputStream;
+import org.apache.cxf.io.WriteOnCloseOutputStream;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.FaultMode;
@@ -200,6 +202,14 @@ public class RMCaptureOutInterceptor extends 
AbstractRMInterceptor  {
 
 // capture message if retransmission possible
 if (isApplicationMessage && !isPartialResponse) {
+OutputStream os = msg.getContent(OutputStream.class);
+// We need to ensure that we have an output stream which won't 
start writing the 
+// message until connection is setup
+if (!(os instanceof WriteOnCloseOutputStream)) {
+WriteOnCloseOutputStream cached = new 
WriteOnCloseOutputStream(os);
+msg.setContent(OutputStream.class, cached);
+os = cached;
+}
 getManager().initializeInterceptorChain(msg);
 //doneCaptureMessage(msg);
 captureMessage(msg);

http://git-wip-us.apache.org/repos/asf/cxf/blob/907fbb7b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
index 5ae80dd..3181efe 100644
--- 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
+++

[1/2] cxf git commit: [CXF-6646] CXF 3.x WSRM Replace RewindableInputStream with CachedOutputStream

2016-06-07 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 40b19d7f6 -> 907fbb7b8


[CXF-6646] CXF 3.x WSRM Replace RewindableInputStream with CachedOutputStream


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

Branch: refs/heads/3.1.x-fixes
Commit: 27a95f050bfdbeb9d3e63af11fc2e8c4370ae549
Parents: 40b19d7
Author: Kai Rommel 
Authored: Wed May 4 02:45:38 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Jun 7 14:28:51 2016 +0200

--
 .../apache/cxf/ws/rm/DestinationSequence.java   |  7 +--
 .../cxf/ws/rm/RMCaptureInInterceptor.java   |  6 +--
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  | 13 --
 .../apache/cxf/ws/rm/RMMessageConstants.java|  6 ++-
 .../cxf/ws/rm/persistence/PersistenceUtils.java | 48 +++-
 .../apache/cxf/ws/rm/persistence/RMMessage.java | 14 +++---
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java   | 18 +++-
 .../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 43 ++
 .../org/apache/cxf/ws/rm/RMManagerTest.java | 22 ++---
 .../ws/rm/persistence/PersistenceUtilsTest.java | 22 ++---
 .../ws/rm/persistence/RMLargeMessageTest.java   |  4 --
 .../cxf/ws/rm/persistence/RMMessageTest.java| 16 +--
 .../rm/persistence/jdbc/RMTxStoreTestBase.java  | 25 +++---
 13 files changed, 167 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/27a95f05/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 2e1a54b..58b7906 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
@@ -33,6 +33,7 @@ import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.continuations.Continuation;
 import org.apache.cxf.continuations.ContinuationProvider;
 import org.apache.cxf.continuations.SuspendedInvocationException;
+import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -167,9 +168,9 @@ public class DestinationSequence extends AbstractSequence {
 RMMessage msg = null;
 if 
(!MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))) {
 msg = new RMMessage();
-RewindableInputStream in = 
(RewindableInputStream)message.get(RMMessageConstants.SAVED_CONTENT);
-in.rewind();
-msg.setContent(in);
+CachedOutputStream cos = 
(CachedOutputStream)message.get(RMMessageConstants.SAVED_CONTENT);
+msg.setContent(cos);
+msg.setContentType((String) message.get(Message.CONTENT_TYPE));
 msg.setMessageNumber(st.getMessageNumber());
 }
 store.persistIncoming(this, msg);

http://git-wip-us.apache.org/repos/asf/cxf/blob/27a95f05/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
index 40b4fab..9d48cbc 100755
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
@@ -57,9 +57,9 @@ public class RMCaptureInInterceptor extends 
AbstractRMInterceptor {
 saved.lockOutputStream();
 
 LOG.fine("Capturing the original RM message");
-RewindableInputStream ris = 
RewindableInputStream.makeRewindable(saved.getInputStream());
-message.setContent(InputStream.class, ris);
-message.put(RMMessageConstants.SAVED_CONTENT, ris);
+//RewindableInputStream ris = 
RewindableInputStream.makeRewindable(saved.getInputStream());
+message.setContent(InputStream.class, 
saved.getInputStream());
+message.put(RMMessageConstants.SAVED_CONTENT, saved);
 } catch (Exception e) {
 throw new Fault(e);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/27a95f05/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java

cxf git commit: [CXF-6863] WS-RM 3.x fix for retransmission works with attachments upon a network error

2016-06-07 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 574b2a999 -> 96eee75e4


[CXF-6863] WS-RM 3.x fix for retransmission works with attachments upon a 
network error

Change-Id: I92c59f572c31fe94e2fa6413304db9ec4b9f514c


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

Branch: refs/heads/master
Commit: 96eee75e4d2ef481fabf2745e9e0ccba9e682d93
Parents: 574b2a9
Author: Kai Rommel 
Authored: Fri Jun 3 19:13:12 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Jun 7 14:21:08 2016 +0200

--
 .../org/apache/cxf/io/CachedOutputStream.java   | 17 +++-
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  | 10 
 .../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 27 ++--
 3 files changed, 34 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/96eee75e/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
--
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java 
b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
index 905f6f7..eeced83 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
@@ -258,14 +258,17 @@ public class CachedOutputStream extends OutputStream {
 }
 } else {
 // read the file
-currentStream.close();
-if (copyOldContent) {
-InputStream fin = createInputStream(tempFile);
-IOUtils.copyAndCloseInput(fin, out);
+try {
+currentStream.close();
+if (copyOldContent) {
+InputStream fin = createInputStream(tempFile);
+IOUtils.copyAndCloseInput(fin, out);
+}
+} finally {
+streamList.remove(currentStream);
+deleteTempFile();
+inmem = true;
 }
-streamList.remove(currentStream);
-deleteTempFile();
-inmem = true;
 }
 }
 currentStream = out;

http://git-wip-us.apache.org/repos/asf/cxf/blob/96eee75e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index 4514e03..b3c412d 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.rm;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +42,7 @@ import org.apache.cxf.interceptor.AttachmentOutInterceptor;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.io.CachedOutputStream;
+import org.apache.cxf.io.WriteOnCloseOutputStream;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.FaultMode;
@@ -200,6 +202,14 @@ public class RMCaptureOutInterceptor extends 
AbstractRMInterceptor  {
 
 // capture message if retransmission possible
 if (isApplicationMessage && !isPartialResponse) {
+OutputStream os = msg.getContent(OutputStream.class);
+// We need to ensure that we have an output stream which won't 
start writing the 
+// message until connection is setup
+if (!(os instanceof WriteOnCloseOutputStream)) {
+WriteOnCloseOutputStream cached = new 
WriteOnCloseOutputStream(os);
+msg.setContent(OutputStream.class, cached);
+os = cached;
+}
 getManager().initializeInterceptorChain(msg);
 //doneCaptureMessage(msg);
 captureMessage(msg);

http://git-wip-us.apache.org/repos/asf/cxf/blob/96eee75e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
index 5ae80dd..3181efe 100644

cxf git commit: add swagger2_spring sample and also fix the jackson dependency for cxf-3.1.6 (adjusted for 3.0.x)

2016-06-07 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes f56ef0eaf -> 8554177b3


add swagger2_spring sample and also fix the jackson dependency for cxf-3.1.6 
(adjusted for 3.0.x)


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

Branch: refs/heads/3.0.x-fixes
Commit: 8554177b382ddb90286862f43ac824ad481a5c57
Parents: f56ef0e
Author: Akitoshi Yoshida 
Authored: Tue Jun 7 09:45:13 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Jun 7 10:02:01 2016 +0200

--
 .../samples/jax_rs/description_swagger2/pom.xml |  10 --
 .../jax_rs/description_swagger2_osgi/pom.xml|  10 --
 .../description_swagger2_spring/README.txt  |  42 ++
 .../jax_rs/description_swagger2_spring/pom.xml  | 113 +++
 .../jaxrs/swagger/server/ApiOriginFilter.java   |  45 ++
 .../java/demo/jaxrs/swagger/server/Item.java|  49 +++
 .../java/demo/jaxrs/swagger/server/Sample.java  | 140 +++
 .../java/demo/jaxrs/swagger/server/Server.java  |  38 +
 .../META-INF/cxf/org.apache.cxf.Logger  |   1 +
 .../src/main/resources/context.xml  |  63 +
 .../src/main/resources/logback.xml  |  16 +++
 .../jax_rs/description_swagger2_web/pom.xml |  10 --
 distribution/src/main/release/samples/pom.xml   |   1 +
 13 files changed, 508 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8554177b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
index 5b3e006..e3f7f55 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -106,16 +106,6 @@
   provided
 
 
-  com.fasterxml.jackson.jaxrs
-  jackson-jaxrs-json-provider
-  2.4.1
-   
-   
-com.fasterxml.jackson.core
-   jackson-core
-   2.4.1
-   
-
 org.apache.cxf
 cxf-rt-transports-http
 3.0.10-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/cxf/blob/8554177b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
index 6471a8b..9fe4ac9 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
@@ -75,16 +75,6 @@ under the License.
 
 
 
-com.fasterxml.jackson.jaxrs
-jackson-jaxrs-json-provider
-2.4.6
-
-
-com.fasterxml.jackson.core
-jackson-core
-2.4.6
-
-
 org.apache.cxf
 cxf-rt-transports-http
 3.0.10-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/cxf/blob/8554177b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
new file mode 100644
index 000..22c9bc3
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
@@ -0,0 +1,42 @@
+JAX-RS Swagger2Feature Spring Demo
+=
+
+The demo shows a basic usage of Swagger 2.0 API documentation with REST based 
Web Services using 
+JAX-RS 2.0 (JSR-339).
+
+Building and running the demo using Maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the Maven pom.xml file can be used to build and run the demo. 
+
+
+Using either UNIX or Windows:
+
+  mvn install
+  mvn -Pserver  (from one command line window)  
+
+
+After the service is started, the Swagger API documents in JSON and YAML
+are available at
+
+  http://localhost:9000/swaggerSample/swagger.json
+  http://localhost:9000/swaggerSample/swagger.yaml
+
+To remove the target dir, run mvn clean".
+
+

cxf git commit: ajdust swagger2_spring pom.xml for cxf-3.1.x

2016-06-07 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d8a6e85e7 -> 40b19d7f6


ajdust swagger2_spring pom.xml for cxf-3.1.x


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

Branch: refs/heads/3.1.x-fixes
Commit: 40b19d7f6f1877f6c2c397548a4e24582c053706
Parents: d8a6e85
Author: Akitoshi Yoshida 
Authored: Tue Jun 7 09:59:26 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Jun 7 09:59:26 2016 +0200

--
 .../samples/jax_rs/description_swagger2_spring/pom.xml| 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/40b19d7f/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
index 66d854a..e9038f6 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.2.0-SNAPSHOT
+3.1.7-SNAPSHOT
 ../..
 
 
@@ -74,23 +74,23 @@
 
 org.apache.cxf
 cxf-rt-transports-http
-3.2.0-SNAPSHOT
+3.1.7-SNAPSHOT
 
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.2.0-SNAPSHOT
+3.1.7-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.2.0-SNAPSHOT
+3.1.7-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-rs-service-description
-3.2.0-SNAPSHOT
+3.1.7-SNAPSHOT
 
 
 commons-httpclient

cxf git commit: add swagger2_spring sample and also fix the jackson dependency for cxf-3.1.6

2016-06-07 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 541ce124b -> d8a6e85e7


add swagger2_spring sample and also fix the jackson dependency for cxf-3.1.6


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

Branch: refs/heads/3.1.x-fixes
Commit: d8a6e85e7de8f01f08462a683e9c9f1aaabff908
Parents: 541ce12
Author: Akitoshi Yoshida 
Authored: Tue Jun 7 09:45:13 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Jun 7 09:51:40 2016 +0200

--
 .../samples/jax_rs/description_swagger2/pom.xml |  10 --
 .../jax_rs/description_swagger2_osgi/pom.xml|  10 --
 .../description_swagger2_spring/README.txt  |  42 ++
 .../jax_rs/description_swagger2_spring/pom.xml  | 113 +++
 .../jaxrs/swagger/server/ApiOriginFilter.java   |  45 ++
 .../java/demo/jaxrs/swagger/server/Item.java|  49 +++
 .../java/demo/jaxrs/swagger/server/Sample.java  | 140 +++
 .../java/demo/jaxrs/swagger/server/Server.java  |  38 +
 .../META-INF/cxf/org.apache.cxf.Logger  |   1 +
 .../src/main/resources/context.xml  |  63 +
 .../src/main/resources/logback.xml  |  16 +++
 .../jax_rs/description_swagger2_web/pom.xml |  10 --
 distribution/src/main/release/samples/pom.xml   |   1 +
 13 files changed, 508 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d8a6e85e/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
index fee06ce..a2ed0db 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -107,16 +107,6 @@
   provided
 
 
-  com.fasterxml.jackson.jaxrs
-  jackson-jaxrs-json-provider
-  2.4.1
-   
-   
-com.fasterxml.jackson.core
-   jackson-core
-   2.4.1
-   
-
 org.apache.cxf
 cxf-rt-transports-http
 3.1.7-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/cxf/blob/d8a6e85e/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
index 925dd36..bc2d0c4 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
@@ -75,16 +75,6 @@ under the License.
 
 
 
-com.fasterxml.jackson.jaxrs
-jackson-jaxrs-json-provider
-2.4.6
-
-
-com.fasterxml.jackson.core
-jackson-core
-2.4.6
-
-
 org.apache.cxf
 cxf-rt-transports-http
 3.1.7-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/cxf/blob/d8a6e85e/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
new file mode 100644
index 000..22c9bc3
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
@@ -0,0 +1,42 @@
+JAX-RS Swagger2Feature Spring Demo
+=
+
+The demo shows a basic usage of Swagger 2.0 API documentation with REST based 
Web Services using 
+JAX-RS 2.0 (JSR-339).
+
+Building and running the demo using Maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the Maven pom.xml file can be used to build and run the demo. 
+
+
+Using either UNIX or Windows:
+
+  mvn install
+  mvn -Pserver  (from one command line window)  
+
+
+After the service is started, the Swagger API documents in JSON and YAML
+are available at
+
+  http://localhost:9000/swaggerSample/swagger.json
+  http://localhost:9000/swaggerSample/swagger.yaml
+
+To remove the target dir, run mvn clean".
+
+
+If you do not have your

cxf git commit: add swagger2_spring sample and also fix the jackson dependency for cxf-3.1.6

2016-06-07 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 703acfd72 -> 574b2a999


add swagger2_spring sample and also fix the jackson dependency for cxf-3.1.6


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

Branch: refs/heads/master
Commit: 574b2a9997c94011794fa2e083181e23c9936f15
Parents: 703acfd
Author: Akitoshi Yoshida 
Authored: Tue Jun 7 09:45:13 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Jun 7 09:47:21 2016 +0200

--
 .../samples/jax_rs/description_swagger2/pom.xml |  10 --
 .../jax_rs/description_swagger2_osgi/pom.xml|  10 --
 .../description_swagger2_spring/README.txt  |  42 ++
 .../jax_rs/description_swagger2_spring/pom.xml  | 113 +++
 .../jaxrs/swagger/server/ApiOriginFilter.java   |  45 ++
 .../java/demo/jaxrs/swagger/server/Item.java|  49 +++
 .../java/demo/jaxrs/swagger/server/Sample.java  | 140 +++
 .../java/demo/jaxrs/swagger/server/Server.java  |  38 +
 .../META-INF/cxf/org.apache.cxf.Logger  |   1 +
 .../src/main/resources/context.xml  |  63 +
 .../src/main/resources/logback.xml  |  16 +++
 .../jax_rs/description_swagger2_web/pom.xml |  10 --
 distribution/src/main/release/samples/pom.xml   |   1 +
 13 files changed, 508 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/574b2a99/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
index 292c80b..50b7503 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -107,16 +107,6 @@
   provided
 
 
-  com.fasterxml.jackson.jaxrs
-  jackson-jaxrs-json-provider
-  2.4.1
-   
-   
-com.fasterxml.jackson.core
-   jackson-core
-   2.4.1
-   
-
 org.apache.cxf
 cxf-rt-transports-http
 3.2.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/cxf/blob/574b2a99/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
index 4df1a58..c2c02cb 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
@@ -75,16 +75,6 @@ under the License.
 
 
 
-com.fasterxml.jackson.jaxrs
-jackson-jaxrs-json-provider
-2.4.6
-
-
-com.fasterxml.jackson.core
-jackson-core
-2.4.6
-
-
 org.apache.cxf
 cxf-rt-transports-http
 3.2.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/cxf/blob/574b2a99/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
new file mode 100644
index 000..22c9bc3
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/README.txt
@@ -0,0 +1,42 @@
+JAX-RS Swagger2Feature Spring Demo
+=
+
+The demo shows a basic usage of Swagger 2.0 API documentation with REST based 
Web Services using 
+JAX-RS 2.0 (JSR-339).
+
+Building and running the demo using Maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the Maven pom.xml file can be used to build and run the demo. 
+
+
+Using either UNIX or Windows:
+
+  mvn install
+  mvn -Pserver  (from one command line window)  
+
+
+After the service is started, the Swagger API documents in JSON and YAML
+are available at
+
+  http://localhost:9000/swaggerSample/swagger.json
+  http://localhost:9000/swaggerSample/swagger.yaml
+
+To remove the target dir, run mvn clean".
+
+
+If you do not have your swagger-ui

cxf git commit: [CXF-6646] CXF 3.x WSRM Replace RewindableInputStream with CachedOutputStream (ajusted for 3.0.x)

2016-05-25 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d2d10aa94 -> 9a6895f45


[CXF-6646] CXF 3.x WSRM Replace RewindableInputStream with CachedOutputStream 
(ajusted for 3.0.x)


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

Branch: refs/heads/3.0.x-fixes
Commit: 9a6895f45529b0c119abd1b20bd75ed07249f191
Parents: d2d10aa
Author: Kai Rommel 
Authored: Wed May 4 02:45:38 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 25 17:29:08 2016 +0200

--
 .../apache/cxf/ws/rm/DestinationSequence.java   |  7 +--
 .../cxf/ws/rm/RMCaptureInInterceptor.java   |  6 +--
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  | 13 --
 .../apache/cxf/ws/rm/RMMessageConstants.java|  6 ++-
 .../cxf/ws/rm/persistence/PersistenceUtils.java | 48 +++-
 .../apache/cxf/ws/rm/persistence/RMMessage.java | 14 +++---
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java   | 18 +++-
 .../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 45 ++
 .../org/apache/cxf/ws/rm/RMManagerTest.java | 22 ++---
 .../ws/rm/persistence/PersistenceUtilsTest.java | 22 ++---
 .../ws/rm/persistence/RMLargeMessageTest.java   |  4 --
 .../cxf/ws/rm/persistence/RMMessageTest.java| 16 +--
 .../rm/persistence/jdbc/RMTxStoreTestBase.java  | 25 +++---
 13 files changed, 168 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9a6895f4/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 2e1a54b..58b7906 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
@@ -33,6 +33,7 @@ import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.continuations.Continuation;
 import org.apache.cxf.continuations.ContinuationProvider;
 import org.apache.cxf.continuations.SuspendedInvocationException;
+import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -167,9 +168,9 @@ public class DestinationSequence extends AbstractSequence {
 RMMessage msg = null;
 if 
(!MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))) {
 msg = new RMMessage();
-RewindableInputStream in = 
(RewindableInputStream)message.get(RMMessageConstants.SAVED_CONTENT);
-in.rewind();
-msg.setContent(in);
+CachedOutputStream cos = 
(CachedOutputStream)message.get(RMMessageConstants.SAVED_CONTENT);
+msg.setContent(cos);
+msg.setContentType((String) message.get(Message.CONTENT_TYPE));
 msg.setMessageNumber(st.getMessageNumber());
 }
 store.persistIncoming(this, msg);

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a6895f4/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
index 40b4fab..9d48cbc 100755
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
@@ -57,9 +57,9 @@ public class RMCaptureInInterceptor extends 
AbstractRMInterceptor {
 saved.lockOutputStream();
 
 LOG.fine("Capturing the original RM message");
-RewindableInputStream ris = 
RewindableInputStream.makeRewindable(saved.getInputStream());
-message.setContent(InputStream.class, ris);
-message.put(RMMessageConstants.SAVED_CONTENT, ris);
+//RewindableInputStream ris = 
RewindableInputStream.makeRewindable(saved.getInputStream());
+message.setContent(InputStream.class, 
saved.getInputStream());
+message.put(RMMessageConstants.SAVED_CONTENT, saved);
 } catch (Exception e) {
 throw new Fault(e);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a6895f4/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java

cxf git commit: Upgrade derby to 10.12.1.1

2016-05-25 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master e85309300 -> ecb6eba58


Upgrade derby to 10.12.1.1


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

Branch: refs/heads/master
Commit: ecb6eba580c81d35991df66681db8dff99b1b087
Parents: e853093
Author: Akitoshi Yoshida 
Authored: Wed May 25 17:10:16 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 25 17:10:16 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/ecb6eba5/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5f256d4..b6d9000 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,7 +80,7 @@
 
3.2.2
 2.6
 3.4
-10.2.2.0
+10.12.1.1
 3.1.2
 2.10.1
 3.0.1

cxf git commit: [CXF-6646] CXF 3.x WSRM Replace RewindableInputStream with CachedOutputStream

2016-05-25 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 9ea9fac62 -> e85309300


[CXF-6646] CXF 3.x WSRM Replace RewindableInputStream with CachedOutputStream


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

Branch: refs/heads/master
Commit: e8530930045a5784fb1ed1f5b58658d7baae2238
Parents: 9ea9fac
Author: Kai Rommel 
Authored: Wed May 4 02:45:38 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 25 16:19:39 2016 +0200

--
 .../apache/cxf/ws/rm/DestinationSequence.java   |  7 +--
 .../cxf/ws/rm/RMCaptureInInterceptor.java   |  6 +--
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  | 13 --
 .../apache/cxf/ws/rm/RMMessageConstants.java|  6 ++-
 .../cxf/ws/rm/persistence/PersistenceUtils.java | 48 +++-
 .../apache/cxf/ws/rm/persistence/RMMessage.java | 14 +++---
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java   | 18 +++-
 .../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 43 ++
 .../org/apache/cxf/ws/rm/RMManagerTest.java | 22 ++---
 .../ws/rm/persistence/PersistenceUtilsTest.java | 22 ++---
 .../ws/rm/persistence/RMLargeMessageTest.java   |  4 --
 .../cxf/ws/rm/persistence/RMMessageTest.java| 16 +--
 .../rm/persistence/jdbc/RMTxStoreTestBase.java  | 25 +++---
 13 files changed, 167 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e8530930/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 2e1a54b..58b7906 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
@@ -33,6 +33,7 @@ import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.continuations.Continuation;
 import org.apache.cxf.continuations.ContinuationProvider;
 import org.apache.cxf.continuations.SuspendedInvocationException;
+import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -167,9 +168,9 @@ public class DestinationSequence extends AbstractSequence {
 RMMessage msg = null;
 if 
(!MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))) {
 msg = new RMMessage();
-RewindableInputStream in = 
(RewindableInputStream)message.get(RMMessageConstants.SAVED_CONTENT);
-in.rewind();
-msg.setContent(in);
+CachedOutputStream cos = 
(CachedOutputStream)message.get(RMMessageConstants.SAVED_CONTENT);
+msg.setContent(cos);
+msg.setContentType((String) message.get(Message.CONTENT_TYPE));
 msg.setMessageNumber(st.getMessageNumber());
 }
 store.persistIncoming(this, msg);

http://git-wip-us.apache.org/repos/asf/cxf/blob/e8530930/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
index 40b4fab..9d48cbc 100755
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
@@ -57,9 +57,9 @@ public class RMCaptureInInterceptor extends 
AbstractRMInterceptor {
 saved.lockOutputStream();
 
 LOG.fine("Capturing the original RM message");
-RewindableInputStream ris = 
RewindableInputStream.makeRewindable(saved.getInputStream());
-message.setContent(InputStream.class, ris);
-message.put(RMMessageConstants.SAVED_CONTENT, ris);
+//RewindableInputStream ris = 
RewindableInputStream.makeRewindable(saved.getInputStream());
+message.setContent(InputStream.class, 
saved.getInputStream());
+message.put(RMMessageConstants.SAVED_CONTENT, saved);
 } catch (Exception e) {
 throw new Fault(e);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e8530930/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java

cxf git commit: add the index info in the error text to help error analysis

2016-05-11 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 62e0f8d45 -> 44d015322


add the index info in the error text to help error analysis


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

Branch: refs/heads/3.0.x-fixes
Commit: 44d015322386fcdb2910be38da77f8b9ef6138a3
Parents: 62e0f8d
Author: Akitoshi Yoshida 
Authored: Wed May 11 13:57:33 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 11 13:58:57 2016 +0200

--
 .../src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/44d01532/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
index ae10a1b..f04c4d0 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
@@ -94,7 +94,7 @@ public class UriBuilderImpl extends UriBuilder implements 
Cloneable {
 }
 for (int i = 0; i < values.length; i++) {
 if (values[i] == null) {
-throw new IllegalArgumentException("Template parameter value 
is set to null");
+throw new IllegalArgumentException("Template parameter value 
at position " + i + " is set to null");
 }
 }

cxf git commit: add the index info in the error text to help error analysis

2016-05-11 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 340a1305b -> b029fcdc8


add the index info in the error text to help error analysis


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

Branch: refs/heads/3.1.x-fixes
Commit: b029fcdc8c4771add662cd438df99c46f077ad42
Parents: 340a130
Author: Akitoshi Yoshida 
Authored: Wed May 11 13:57:33 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 11 13:58:12 2016 +0200

--
 .../src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b029fcdc/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
index beb38e9..261351b 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
@@ -94,7 +94,7 @@ public class UriBuilderImpl extends UriBuilder implements 
Cloneable {
 }
 for (int i = 0; i < values.length; i++) {
 if (values[i] == null) {
-throw new IllegalArgumentException("Template parameter value 
is set to null");
+throw new IllegalArgumentException("Template parameter value 
at position " + i + " is set to null");
 }
 }

cxf git commit: add the index info in the error text to help error analysis

2016-05-11 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master ee6ceea0d -> 242fc643d


add the index info in the error text to help error analysis


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

Branch: refs/heads/master
Commit: 242fc643d4e8f71328193c7827150ca19faa0eeb
Parents: ee6ceea
Author: Akitoshi Yoshida 
Authored: Wed May 11 13:57:33 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 11 13:57:33 2016 +0200

--
 .../src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/242fc643/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
index beb38e9..261351b 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
@@ -94,7 +94,7 @@ public class UriBuilderImpl extends UriBuilder implements 
Cloneable {
 }
 for (int i = 0; i < values.length; i++) {
 if (values[i] == null) {
-throw new IllegalArgumentException("Template parameter value 
is set to null");
+throw new IllegalArgumentException("Template parameter value 
at position " + i + " is set to null");
 }
 }

[2/2] cxf git commit: [CXF-6886] a minor checkstyle fix needed for 3.0.x

2016-05-04 Thread ay

[CXF-6886] a minor checkstyle fix needed for 3.0.x


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

Branch: refs/heads/3.1.x-fixes
Commit: 5c5c113633d67aafab3753c9f33920bedc5a09d0
Parents: 6361930
Author: Akitoshi Yoshida 
Authored: Wed May 4 12:40:07 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 4 12:41:53 2016 +0200

--
 rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5c5c1136/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
--
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java 
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index ea082b2..645708a 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -588,8 +588,7 @@ public class RMManagerTest extends Assert {
   Conduit conduit, 
   SourceSequence ss, 
   DestinationSequence ds, RMMessage m,
-  Capture mc)
-  throws IOException  {
+  Capture mc) throws IOException {
 RMStore store = control.createMock(RMStore.class);
 RetransmissionQueue queue = 
control.createMock(RetransmissionQueue.class);
 manager.setStore(store);

[1/2] cxf git commit: [CXF-6886] CXF 3.x WSRM attachments are not retransmitted (modified patch based on kai's patches)

2016-05-04 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 576c7e830 -> 5c5c11363


[CXF-6886] CXF 3.x WSRM attachments are not retransmitted (modified patch based 
on kai's patches)


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

Branch: refs/heads/3.1.x-fixes
Commit: 63619304f29bf703a4301aa11c9cabfe9edeede7
Parents: 576c7e8
Author: Akitoshi Yoshida 
Authored: Mon May 2 13:35:15 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 4 12:41:48 2016 +0200

--
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  |   5 +-
 .../java/org/apache/cxf/ws/rm/RMManager.java|   6 +-
 .../cxf/ws/rm/persistence/PersistenceUtils.java |  61 ++-
 .../apache/cxf/ws/rm/persistence/RMMessage.java |  23 +++
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java   | 159 ---
 .../org/apache/cxf/ws/rm/RMManagerTest.java | 141 +++-
 .../ws/rm/persistence/PersistenceUtilsTest.java | 109 +
 .../ws/rm/persistence/SerializedRMMessage.txt   |  14 ++
 .../rm/persistence/jdbc/RMTxStoreTestBase.java  |  11 +-
 9 files changed, 386 insertions(+), 143 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/63619304/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index 6890201..c0ca125 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -54,6 +54,7 @@ import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
+import org.apache.cxf.ws.rm.persistence.PersistenceUtils;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.v200702.Identifier;
@@ -273,7 +274,9 @@ public class RMCaptureOutInterceptor extends 
AbstractRMInterceptor  {
 msg.setTo(maps.getTo().getValue());
 }
 }
-msg.setContent(bis);
+// serializes the message content and the attachments into
+// the RMMessage content
+PersistenceUtils.encodeRMContent(msg, message, bis);
 store.persistOutgoing(ss, msg);
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/63619304/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
--
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
index 7e6e0ff..9639cfe 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
@@ -66,6 +66,7 @@ import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
 import org.apache.cxf.ws.rm.manager.RM10AddressingNamespaceType;
 import org.apache.cxf.ws.rm.manager.SequenceTerminationPolicyType;
 import org.apache.cxf.ws.rm.manager.SourcePolicyType;
+import org.apache.cxf.ws.rm.persistence.PersistenceUtils;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.policy.RMPolicyUtilities;
@@ -610,7 +611,10 @@ public class RMManager {
 }
 
 try {
-message.put(RMMessageConstants.SAVED_CONTENT, 
RewindableInputStream.makeRewindable(m.getContent()));
+// RMMessage is stored in a serialized way, therefore
+// RMMessage content must be splitted into soap root message
+// and attachments
+PersistenceUtils.decodeRMContent(m, message);
 RMContextUtils.setProtocolVariation(message, ss.getProtocol());
 retransmissionQueue.addUnacknowledged(message);
 } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/63619304/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java

cxf git commit: [CXF-6886] a minor checkstyle fix needed for 3.0.x

2016-05-04 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 549106959 -> 8f9ae274a


[CXF-6886] a minor checkstyle fix needed for 3.0.x


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

Branch: refs/heads/master
Commit: 8f9ae274aaa29653f920ffa422890d5f1a91ac76
Parents: 5491069
Author: Akitoshi Yoshida 
Authored: Wed May 4 12:40:07 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 4 12:40:20 2016 +0200

--
 rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8f9ae274/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
--
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java 
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index ea082b2..645708a 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -588,8 +588,7 @@ public class RMManagerTest extends Assert {
   Conduit conduit, 
   SourceSequence ss, 
   DestinationSequence ds, RMMessage m,
-  Capture mc)
-  throws IOException  {
+  Capture mc) throws IOException {
 RMStore store = control.createMock(RMStore.class);
 RetransmissionQueue queue = 
control.createMock(RetransmissionQueue.class);
 manager.setStore(store);

[2/2] cxf git commit: [CXF-6886] a minor checkstyle fix needed for 3.0.x

2016-05-04 Thread ay

[CXF-6886] a minor checkstyle fix needed for 3.0.x


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

Branch: refs/heads/3.0.x-fixes
Commit: b096f12f387d07b114dd6d23809ae5bf0951a973
Parents: 62d67aa
Author: Akitoshi Yoshida 
Authored: Wed May 4 12:40:07 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 4 12:42:57 2016 +0200

--
 rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b096f12f/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
--
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java 
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index a774e36..4bb59f1 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -588,8 +588,7 @@ public class RMManagerTest extends Assert {
   Conduit conduit, 
   SourceSequence ss, 
   DestinationSequence ds, RMMessage m,
-  Capture mc)
-  throws IOException  {
+  Capture mc) throws IOException {
 RMStore store = control.createMock(RMStore.class);
 RetransmissionQueue queue = 
control.createMock(RetransmissionQueue.class);
 manager.setStore(store);

[1/2] cxf git commit: [CXF-6886] CXF 3.x WSRM attachments are not retransmitted (modified patch based on kai's patches)

2016-05-04 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes f7f22c68a -> b096f12f3


[CXF-6886] CXF 3.x WSRM attachments are not retransmitted (modified patch based 
on kai's patches)


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

Branch: refs/heads/3.0.x-fixes
Commit: 62d67aa204e6a3218007581fbc5b65851811f973
Parents: f7f22c6
Author: Akitoshi Yoshida 
Authored: Mon May 2 13:35:15 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed May 4 12:42:55 2016 +0200

--
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  |   5 +-
 .../java/org/apache/cxf/ws/rm/RMManager.java|   6 +-
 .../cxf/ws/rm/persistence/PersistenceUtils.java |  61 ++-
 .../apache/cxf/ws/rm/persistence/RMMessage.java |  23 +++
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java   | 159 ---
 .../org/apache/cxf/ws/rm/RMManagerTest.java | 141 +++-
 .../ws/rm/persistence/PersistenceUtilsTest.java | 109 +
 .../ws/rm/persistence/SerializedRMMessage.txt   |  14 ++
 .../rm/persistence/jdbc/RMTxStoreTestBase.java  |  11 +-
 9 files changed, 386 insertions(+), 143 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/62d67aa2/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index 8f1df9e..a580071 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -54,6 +54,7 @@ import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
+import org.apache.cxf.ws.rm.persistence.PersistenceUtils;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.v200702.Identifier;
@@ -272,7 +273,9 @@ public class RMCaptureOutInterceptor extends 
AbstractRMInterceptor  {
 msg.setTo(maps.getTo().getValue());
 }
 }
-msg.setContent(bis);
+// serializes the message content and the attachments into
+// the RMMessage content
+PersistenceUtils.encodeRMContent(msg, message, bis);
 store.persistOutgoing(ss, msg);
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d67aa2/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
--
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
index 4442ec5..fc24db4 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
@@ -69,6 +69,7 @@ import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
 import org.apache.cxf.ws.rm.manager.RM10AddressingNamespaceType;
 import org.apache.cxf.ws.rm.manager.SequenceTerminationPolicyType;
 import org.apache.cxf.ws.rm.manager.SourcePolicyType;
+import org.apache.cxf.ws.rm.persistence.PersistenceUtils;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.policy.RMPolicyUtilities;
@@ -618,7 +619,10 @@ public class RMManager {
 }
 
 try {
-message.put(RMMessageConstants.SAVED_CONTENT, 
RewindableInputStream.makeRewindable(m.getContent()));
+// RMMessage is stored in a serialized way, therefore
+// RMMessage content must be splitted into soap root message
+// and attachments
+PersistenceUtils.decodeRMContent(m, message);
 RMContextUtils.setProtocolVariation(message, ss.getProtocol());
 retransmissionQueue.addUnacknowledged(message);
 } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d67aa2/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java

cxf git commit: [CXF-6886] CXF 3.x WSRM attachments are not retransmitted (modified patch based on kai's patches)

2016-05-03 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 95d185201 -> cd0e74b89


[CXF-6886] CXF 3.x WSRM attachments are not retransmitted (modified patch based 
on kai's patches)


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

Branch: refs/heads/master
Commit: cd0e74b89aaf113374ce74262308620dcad263d4
Parents: 95d1852
Author: Akitoshi Yoshida 
Authored: Mon May 2 13:35:15 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue May 3 14:24:12 2016 +0200

--
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  |   5 +-
 .../java/org/apache/cxf/ws/rm/RMManager.java|   6 +-
 .../cxf/ws/rm/persistence/PersistenceUtils.java |  61 ++-
 .../apache/cxf/ws/rm/persistence/RMMessage.java |  23 +++
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java   | 159 ---
 .../org/apache/cxf/ws/rm/RMManagerTest.java | 141 +++-
 .../ws/rm/persistence/PersistenceUtilsTest.java | 109 +
 .../ws/rm/persistence/SerializedRMMessage.txt   |  14 ++
 .../rm/persistence/jdbc/RMTxStoreTestBase.java  |  11 +-
 9 files changed, 386 insertions(+), 143 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cd0e74b8/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index 6890201..c0ca125 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -54,6 +54,7 @@ import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
+import org.apache.cxf.ws.rm.persistence.PersistenceUtils;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.v200702.Identifier;
@@ -273,7 +274,9 @@ public class RMCaptureOutInterceptor extends 
AbstractRMInterceptor  {
 msg.setTo(maps.getTo().getValue());
 }
 }
-msg.setContent(bis);
+// serializes the message content and the attachments into
+// the RMMessage content
+PersistenceUtils.encodeRMContent(msg, message, bis);
 store.persistOutgoing(ss, msg);
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/cd0e74b8/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
--
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
index 7e6e0ff..9639cfe 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
@@ -66,6 +66,7 @@ import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
 import org.apache.cxf.ws.rm.manager.RM10AddressingNamespaceType;
 import org.apache.cxf.ws.rm.manager.SequenceTerminationPolicyType;
 import org.apache.cxf.ws.rm.manager.SourcePolicyType;
+import org.apache.cxf.ws.rm.persistence.PersistenceUtils;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.policy.RMPolicyUtilities;
@@ -610,7 +611,10 @@ public class RMManager {
 }
 
 try {
-message.put(RMMessageConstants.SAVED_CONTENT, 
RewindableInputStream.makeRewindable(m.getContent()));
+// RMMessage is stored in a serialized way, therefore
+// RMMessage content must be splitted into soap root message
+// and attachments
+PersistenceUtils.decodeRMContent(m, message);
 RMContextUtils.setProtocolVariation(message, ss.getProtocol());
 retransmissionQueue.addUnacknowledged(message);
 } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/cd0e74b8/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java

cxf git commit: [CXF-6878] Protect against other exception during consuming left-over data

2016-04-22 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes b12e82fc4 -> 1f4fc56a9


[CXF-6878] Protect against other exception during consuming left-over data


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

Branch: refs/heads/3.0.x-fixes
Commit: 1f4fc56a9272bdce356890ab905259630e7fe36f
Parents: b12e82f
Author: Akitoshi Yoshida 
Authored: Fri Apr 22 15:16:12 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Apr 22 15:17:52 2016 +0200

--
 .../org/apache/cxf/transport/http/AbstractHTTPDestination.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1f4fc56a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index 76193fb..c8ef130 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -599,7 +599,7 @@ public abstract class AbstractHTTPDestination
 //However, also don't want to consume indefinitely.   We'll limit 
to 16M.
 try {
 IOUtils.consume(in, 16 * 1024 * 1024);
-} catch (IOException ioe) {
+} catch (Exception ioe) {
 //ignore
 }
 }

cxf git commit: [CXF-6878] Protect against other exception during consuming left-over data

2016-04-22 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c0cd1f446 -> c4a261b1b


[CXF-6878] Protect against other exception during consuming left-over data


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

Branch: refs/heads/3.1.x-fixes
Commit: c4a261b1bede293964feaf490c96c334783c13d9
Parents: c0cd1f4
Author: Akitoshi Yoshida 
Authored: Fri Apr 22 15:16:12 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Apr 22 15:17:00 2016 +0200

--
 .../org/apache/cxf/transport/http/AbstractHTTPDestination.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c4a261b1/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index 722356c..577f262 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -599,7 +599,7 @@ public abstract class AbstractHTTPDestination
 //However, also don't want to consume indefinitely.   We'll limit 
to 16M.
 try {
 IOUtils.consume(in, 16 * 1024 * 1024);
-} catch (IOException ioe) {
+} catch (Exception ioe) {
 //ignore
 }
 }

cxf git commit: [CXF-6878] Protect against other exception during consuming left-over data

2016-04-22 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 7f73b4b67 -> f95f6649f


[CXF-6878] Protect against other exception during consuming left-over data


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

Branch: refs/heads/master
Commit: f95f6649f0667cec1eba9321aa4a055df6466edf
Parents: 7f73b4b
Author: Akitoshi Yoshida 
Authored: Fri Apr 22 15:16:12 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Apr 22 15:16:20 2016 +0200

--
 .../org/apache/cxf/transport/http/AbstractHTTPDestination.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f95f6649/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index 722356c..577f262 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -599,7 +599,7 @@ public abstract class AbstractHTTPDestination
 //However, also don't want to consume indefinitely.   We'll limit 
to 16M.
 try {
 IOUtils.consume(in, 16 * 1024 * 1024);
-} catch (IOException ioe) {
+} catch (Exception ioe) {
 //ignore
 }
 }

cxf git commit: replace the old method usage with the new one

2016-04-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d7bdfe5f1 -> b4870788d


replace the old method usage with the new one


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

Branch: refs/heads/3.0.x-fixes
Commit: b4870788d04c2da796fac61f119d5f14298a508d
Parents: d7bdfe5
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 23:12:51 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 23:16:51 2016 +0200

--
 .../websocket/atmosphere/DefaultProtocolInterceptor.java | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b4870788/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
--
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index 867faae..5a188f4 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.websocket.atmosphere;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -160,12 +159,7 @@ public class DefaultProtocolInterceptor extends 
AtmosphereInterceptorAdapter {
 AsyncIOWriter writer = res.getAsyncIOWriter();
 
 if (writer instanceof AtmosphereInterceptorWriter) {
-//REVIST need a better way to add a custom filter at the first 
entry and not at the last as
-// e.g. interceptor(AsyncIOInterceptor interceptor, int position)
-Deque filters = 
AtmosphereInterceptorWriter.class.cast(writer).filters();
-if (!filters.contains(interceptor)) {
-filters.addFirst(interceptor);
-}
+
AtmosphereInterceptorWriter.class.cast(writer).interceptor(interceptor, 0);
 }
 }

cxf git commit: replace the old method usage with the new one

2016-04-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 1b30b3c83 -> 3fac6a1dd


replace the old method usage with the new one


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

Branch: refs/heads/3.1.x-fixes
Commit: 3fac6a1dd724f3524eda742a01f8d1ffbcc55d0f
Parents: 1b30b3c
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 23:12:51 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 23:13:22 2016 +0200

--
 .../websocket/atmosphere/DefaultProtocolInterceptor.java | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3fac6a1d/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
--
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index 54d8645..41e3ccb 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -22,7 +22,6 @@ package org.apache.cxf.transport.websocket.atmosphere;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -244,12 +243,7 @@ public class DefaultProtocolInterceptor extends 
AtmosphereInterceptorAdapter {
 AsyncIOWriter writer = res.getAsyncIOWriter();
 
 if (writer instanceof AtmosphereInterceptorWriter) {
-//REVIST need a better way to add a custom filter at the first 
entry and not at the last as
-// e.g. interceptor(AsyncIOInterceptor interceptor, int position)
-Deque filters = 
AtmosphereInterceptorWriter.class.cast(writer).filters();
-if (!filters.contains(interceptor)) {
-filters.addFirst(interceptor);
-}
+
AtmosphereInterceptorWriter.class.cast(writer).interceptor(interceptor, 0);
 }
 }

cxf git commit: add node_modules in .gitignore

2016-04-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 7e5bd4cf5 -> b2e5fb658


add node_modules in .gitignore


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

Branch: refs/heads/master
Commit: b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
Parents: 7e5bd4c
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 15:45:42 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 15:46:42 2016 +0200

--
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
--


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

[1/2] cxf git commit: Upgrade atmosphere to 2.3.7 (for cxf-3.0.x)

2016-04-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 8dda906e3 -> 4ecaacfc9


Upgrade atmosphere to 2.3.7 (for cxf-3.0.x)


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

Branch: refs/heads/3.0.x-fixes
Commit: 66362282cf232b389a66e66299a0d9f7774c07a1
Parents: 8dda906
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 15:23:54 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 15:50:20 2016 +0200

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/66362282/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 19d0a00..6fb829f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -76,8 +76,8 @@
 5.9.1
 1.8.5
 2.0.0-M19
-2.2.7
-[2.0,3.0)
+2.3.7
+[2.0,2.4)
 1.2.14
 1.54
 2.2_2

[2/2] cxf git commit: add node_modules in .gitignore

2016-04-05 Thread ay

add node_modules in .gitignore


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

Branch: refs/heads/3.0.x-fixes
Commit: 4ecaacfc93aba9b9e16b0e6869b3d432b1d6e207
Parents: 6636228
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 15:45:42 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 15:50:28 2016 +0200

--
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4ecaacfc/.gitignore
--
diff --git a/.gitignore b/.gitignore
index dbf1353..808ed60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 target/
 velocity.log
 bin/
+node_modules/

cxf git commit: add node_modules in .gitignore

2016-04-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e51e9006d -> 3678640f1


add node_modules in .gitignore


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

Branch: refs/heads/3.1.x-fixes
Commit: 3678640f15e3df8439c45a3cbae7ce12854b8a37
Parents: e51e900
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 15:45:42 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 15:48:15 2016 +0200

--
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3678640f/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 51c4cdd..4b6fccd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ target/
 velocity.log
 bin/
 *~
+node_modules/

[7/8] cxf git commit: add a blueprint version of websocket sample for karaf

2016-04-05 Thread ay

add a blueprint version of websocket sample for karaf


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

Branch: refs/heads/3.1.x-fixes
Commit: 5ce682771ae91eab61e25eaa90ef416168eb4402
Parents: de9b793
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 10:38:42 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 13:36:58 2016 +0200

--
 .../samples/jax_rs/websocket_osgi/README.txt|  94 +++
 .../samples/jax_rs/websocket_osgi/pom.xml   |  94 +++
 .../main/java/demo/jaxrs/server/Customer.java   |  43 +++
 .../java/demo/jaxrs/server/CustomerService.java | 271 +++
 .../src/main/java/demo/jaxrs/server/Order.java  |  69 +
 .../main/java/demo/jaxrs/server/Product.java|  43 +++
 .../resources/OSGI-INF/blueprint/context.xml|  47 
 .../websocket_osgi/src/test/resources/client.js | 234 
 8 files changed, 895 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5ce68277/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
new file mode 100644
index 000..60d7705
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
@@ -0,0 +1,94 @@
+JAX-RS WebSocket OSGi Blueprint Demo 
+=
+
+This is an OSGi Blueprint version of JAX-RS WebSocket Demo.
+
+Building and running the demo using maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the maven pom.xml file can be used to build and run the demo. 
+
+
+Using either UNIX or Windows:
+
+  mvn install
+
+This will produce a war file in the target folder.
+
+
+Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html)
+
+  bin/karaf
+
+
+  __ __    
+ / //_/ __ _/ __/  
+/ ,<  / __ `/ ___/ __ `/ /_
+   / /| |/ /_/ / /  / /_/ / __/
+  /_/ |_|\__,_/_/   \__,_/_/ 
+  
+Apache Karaf (3.0.4)
+  
+  Hit '' for a list of available commands
+  and '[cmd] --help' for help on a specific command.
+  Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf.
+
+
+In order to install CXF's features, you need to add the CXF's features repo 
using
+
+  feature:repo-add cxf 3.n.m
+
+ where 3.n.m corresponds to a valid CXF version number
+
+Install CXF's cxf-jaxrs and cxf-transports-websocket-server features that 
installs all the required bundles
+for this demo bundle.
+
+  feature:install cxf-jaxrs cxf-transports-websocket-server
+
+Install this demo bundle (using the appropriate bundle version number)
+
+  install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi/3.n.m
+
+And verify the bundles are installed.
+
+karaf@root()> feature:repo-add cxf 3.2.0-SNAPSHOT
+Adding feature url 
mvn:org.apache.cxf.karaf/apache-cxf/3.2.0-SNAPSHOT/xml/features
+karaf@root()> feature:install cxf-jaxrs cxf-transports-websocket-server
+karaf@root()> list -t 0 | grep CXF
+ 80 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Core  
  
+ 81 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime Management
  
+100 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime HTTP Transport
  
+102 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Extensions: 
Providers
+103 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Extensions: Search 
  
+104 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Service 
Description  
+105 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime JAX-RS Frontend   
  
+106 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Client 
  
+108 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime WebSocket 
Transport 
+karaf@root()> install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi
+Bundle ID: 109
+karaf@root()> list
+START LEVEL 100 , List Threshold: 50
+ ID | State  | Lvl | Version| Name   
+-
+107 | Active |  80 | 2.4.3  | atmosphere-runtime 
+109 | Active |  80 | 3.2.0.SNAPSHOT | JAX-RS

[6/8] cxf git commit: use a non-empty context-path for samples/jax_rs/websocket sample

2016-04-05 Thread ay

use a non-empty context-path for samples/jax_rs/websocket sample


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

Branch: refs/heads/3.1.x-fixes
Commit: b52157a330d9ef4daab8d2826579cb68ca171c69
Parents: f12eb1a
Author: Akitoshi Yoshida 
Authored: Wed Mar 23 14:23:03 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 13:36:58 2016 +0200

--
 .../release/samples/jax_rs/websocket/README.txt | 26 -
 .../src/main/java/demo/jaxrs/client/Client.java | 29 ---
 .../src/main/java/demo/jaxrs/server/Server.java |  4 ++-
 .../websocket/src/main/resources/index.html |  4 +--
 .../websocket/src/test/resources/client.js  | 30 +++-
 5 files changed, 46 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b52157a3/distribution/src/main/release/samples/jax_rs/websocket/README.txt
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
index f1d3455..8df709e 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
@@ -3,7 +3,7 @@ JAX-RS WebSocket Demo
 
 This is a websocket transport version of JAX-RS Basic Demo.
 
-A RESTful customer service is provided on URL ws://localhost:9000/customers. 
+A RESTful customer service is provided on URL ws://localhost:9000/demo
 Users access this URI to operate on customer.
 
 This sample includes two convenient clients: a plain javascript browser client
@@ -13,12 +13,12 @@ and a node.js client based on atmosphere.
 Connecting to the server
 ---
 
-Open a websocket to ws://localhost:9000/ and send requests over the websocket.
+Open a websocket to ws://localhost:9000/demo and send requests over the 
websocket.
 
-A GET request to path /customerservice/customers/123
+A GET request to path /demo/customerservice/customers/123
 
 
-GET /customerservice/customers/123
+GET /demo/customerservice/customers/123
 
 
 returns a customer instance whose id is 123. The XML document returned:
@@ -30,10 +30,10 @@ returns a customer instance whose id is 123. The XML 
document returned:
 
 
 
-A GET request to path /customerservice/orders/223/products/323
+A GET request to path /demo/customerservice/orders/223/products/323
 
 
-GET /customerservice/orders/223/products/323
+GET /demo/customerservice/orders/223/products/323
 
 
 returns product 323 that belongs to order 223. The XML document returned:
@@ -48,7 +48,7 @@ returns product 323 that belongs to order 223. The XML 
document returned:
 A POST request to path /customerservice/customers
 
 
-POST /customerservice/customers
+POST /demo/customerservice/customers
 Content-Type: text/xml; charset="utf-8"
 
 
@@ -63,7 +63,7 @@ with the data:
 adds a customer whose name is Jack 
 
 
-A PUT request to path /customerservice/customers
+A PUT request to path /demo/customerservice/customers
 
 
 PUT /customerservice/customers
@@ -82,20 +82,20 @@ with the data:
 updates the customer instance whose id is 123
 
 
-A GET request to path /monitor with id monitor-12345
+A GET request to path /demo/monitor with id monitor-12345
 
 
-GET /customerservice/monitor
+GET /demo/customerservice/monitor
 requestId: monitor-12345
 
 
 returns a continuous event stream on the customer
 activities. Try invoking some customer related operations.
 
-A GET request to path /unmonitor with id monitor-12345
+A GET request to path /demo/unmonitor with id monitor-12345
 
 
-GET /customerservice/unmonitor/monitor-12345
+GET /demo/customerservice/unmonitor/monitor-12345
 
 
 unregisters the event

[2/8] cxf git commit: [CXF-5855] enable atmosphere's sse handling; update the sample

2016-04-05 Thread ay

[CXF-5855] enable atmosphere's sse handling; update the sample


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

Branch: refs/heads/3.1.x-fixes
Commit: 35f01c94841870afa8331e0591aec8a3bc4ca94d
Parents: 897d81d
Author: Akitoshi Yoshida 
Authored: Thu Mar 17 00:11:58 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 13:36:57 2016 +0200

--
 .../jax_rs/websocket/src/test/resources/client.js | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/35f01c94/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
 
b/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
index 7eb55f3..8e8d653 100644
--- 
a/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
+++ 
b/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
@@ -8,7 +8,7 @@
 
 "use strict";
 
-var HOST_URL = 'http://localhost:9100/';
+var HOST_URL = 'http://localhost:9000/';
 
 var reader = require('readline');
 var prompt = reader.createInterface(process.stdin, process.stdout);
@@ -25,13 +25,13 @@ var isopen = false;
 const TRANSPORT_NAMES = ["websocket", "sse"];
 
 const COMMAND_LIST = 
-[["add name",   "Add a new consumer and return the customer 
instance."],
- ["delete id",  "Delete the customer."],
- ["get id", "Return the customere."],
+[["add name",   "Add a new consumer and return the customer instance. 
(e.g., add green)"],
+ ["delete id",  "Delete the customer. (e.g., delete 124)"],
+ ["get id", "Return the customere. (e.g., get 123)"],
  ["quit",   "Quit the application."],
- ["subscribe",  "Subscribe to the customer updatese."],
- ["unsubscribe","Unsubscribe from the customer updatese."],
- ["update id name", "Update the customer."]];
+ ["subscribe",  "Subscribe to the customer queries."],
+ ["unsubscribe","Unsubscribe from the customer queries."],
+ ["update id name", "Update the customer. (e.g., update 125 red)"]];
 
 function selectOption(c, opts) {
 var i = parseInt(c);

[5/8] cxf git commit: add a webapp version of samples/jax_rs/websocket (for cxf-3.1.x)

2016-04-05 Thread ay

add a webapp version of samples/jax_rs/websocket (for cxf-3.1.x)


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

Branch: refs/heads/3.1.x-fixes
Commit: de9b7936156d622c284df7f055acac80b920b7d0
Parents: b52157a
Author: Akitoshi Yoshida 
Authored: Wed Mar 23 14:40:00 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 13:36:58 2016 +0200

--
 .../samples/jax_rs/websocket_web/README.txt |  32 +++
 .../samples/jax_rs/websocket_web/pom.xml| 123 +
 .../main/java/demo/jaxrs/server/Customer.java   |  43 +++
 .../java/demo/jaxrs/server/CustomerService.java | 271 +++
 .../src/main/java/demo/jaxrs/server/Order.java  |  69 +
 .../main/java/demo/jaxrs/server/Product.java|  43 +++
 .../src/main/webapp/WEB-INF/beans.xml   |  46 
 .../src/main/webapp/WEB-INF/web.xml |  42 +++
 8 files changed, 669 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/de9b7936/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
new file mode 100644
index 000..36008ed
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
@@ -0,0 +1,32 @@
+JAX-RS WebSocket WebApp Demo 
+=
+
+This is an WebApp version of JAX-RS WebSocket Demo.
+
+Building and running the demo using maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the maven pom.xml file can be used to build and run the demo. 
+
+
+Using either UNIX or Windows:
+
+  mvn install
+
+This will produce a war file in the target folder.
+
+To run the war file using jetty9
+
+  mvn jetty:run-war  (from one command line window)
+
+To run the war file using tomcat7
+
+  mvn tomcat7:run-war  (from one command line window)
+
+To remove the target dir, run mvn clean".
+
+
+You can use the same clients included in JAX-RS WebSockt Demo.
+Refer to samples/jax_rs/websocket/README.txt for more information.
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/de9b7936/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
new file mode 100644
index 000..7b76bbc
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -0,0 +1,123 @@
+
+
+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
+jax_rs_websocket_web
+JAX-RS WebSocket Demo
+JAX-RS WebSocket WebApp Demo
+war
+
+org.apache.cxf.samples
+cxf-samples
+3.1.7-SNAPSHOT
+../..
+
+
+${project.version}
+
+2.3.7
+9.2.15.v20160210
+9.3.5.v20151012
+${cxf.jetty92.version}
+
+
+
+
+org.eclipse.jetty
+jetty-maven-plugin
+${cxf.jetty.version}
+
+
${project.build.directory}/${project.name}
+1
+
+9000
+
+
+/
+
+
+
+
+org.apache.tomcat.maven
+tomcat7-maven-plugin
+2.2
+
+
${project.build.directory}/${project.artifactId}
+9000
+/
+
+
+
+run-tomcat
+
+true
+
+
+run
+
+
+
+
+
+
+
+
+
+org.apache.cxf
+cxf-rt-transports-http
+3.1.7-SNAPSHOT
+
+
+org.apache.cxf
+cxf-rt-transports-websocket
+3.1.7-SNAPSHOT
+
+
+org.apache.cxf
+cxf-rt-frontend-jaxrs
+3.1.7-SNAPSHOT
+
+

[1/8] cxf git commit: add the stacktrace output in CustomerService for CXF-5855

2016-04-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 91197fdb2 -> 75edfe9d2


add the stacktrace output in CustomerService for CXF-5855


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

Branch: refs/heads/3.1.x-fixes
Commit: f12eb1a2a2eb2220550cb25dcc54d62127d55244
Parents: 35f01c9
Author: Akitoshi Yoshida 
Authored: Thu Mar 17 10:08:25 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 13:36:57 2016 +0200

--
 .../src/main/java/demo/jaxrs/server/CustomerService.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f12eb1a2/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
 
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index cc039ff..f77f8aa 100644
--- 
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++ 
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -186,6 +186,8 @@ public class CustomerService {
 } catch (IOException e) {
 System.out.println("error writing to " + 
wh.getValue() + " " + wh.get());
 if (wh.increment()) {
+// the max error count reached; purging the 
output resource
+e.printStackTrace();
 try {
 wh.getValue().close();
 } catch (IOException e2) {
@@ -205,6 +207,8 @@ public class CustomerService {
 } catch (IOException e) {
 System.out.println("error writing to " + 
wh.getValue() + " " + wh.get());
 if (wh.increment()) {
+// the max error count reached; purging the 
output resource
+e.printStackTrace();
 try {
 wh.getValue().getOutputStream().close();
 } catch (IOException e2) {

[4/8] cxf git commit: [CXF-5855] enable atmosphere's sse handling; update the sample

2016-04-05 Thread ay

[CXF-5855] enable atmosphere's sse handling; update the sample


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

Branch: refs/heads/3.1.x-fixes
Commit: a529d270668dabd1cfa6b040769cb25af97973db
Parents: 91197fd
Author: Akitoshi Yoshida 
Authored: Thu Mar 17 00:11:58 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 13:36:57 2016 +0200

--
 .../release/samples/jax_rs/websocket/README.txt |  26 ++-
 .../release/samples/jax_rs/websocket/pom.xml|  10 +-
 .../java/demo/jaxrs/server/CustomerService.java | 105 -
 .../websocket/src/test/resources/client.js  | 232 +++
 .../websocket/atmosphere/AtmosphereUtils.java   |  18 ++
 .../AtmosphereWebSocketJettyDestination.java|   3 +-
 .../AtmosphereWebSocketServletDestination.java  |   3 +-
 .../atmosphere/DefaultProtocolInterceptor.java  |  90 ++-
 8 files changed, 463 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a529d270/distribution/src/main/release/samples/jax_rs/websocket/README.txt
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
index 09c43e8..f1d3455 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
@@ -6,6 +6,13 @@ This is a websocket transport version of JAX-RS Basic Demo.
 A RESTful customer service is provided on URL ws://localhost:9000/customers. 
 Users access this URI to operate on customer.
 
+This sample includes two convenient clients: a plain javascript browser client
+and a node.js client based on atmosphere.
+
+
+Connecting to the server
+---
+
 Open a websocket to ws://localhost:9000/ and send requests over the websocket.
 
 A GET request to path /customerservice/customers/123
@@ -102,7 +109,6 @@ Please review the README in the samples directory before
 continuing.
 
 
-
 Building and running the demo using maven
 ---
 
@@ -118,6 +124,8 @@ Using either UNIX or Windows:
 
 To remove the target dir, run mvn clean".
 
+Using Javascript client in Browser
+
 Using a web browser that natively supports WebSocket (Safari, Chrome, Firefox):
 After starting the server (see above), open the index.html page located at
 
@@ -140,3 +148,19 @@ Content-Type: text/xml; charset="utf-8"
   Jack
 
 
+
+
+Using Node.js client 
+
+
+Go to samples/jax_rs/websocket/src/test/resources and at the console
+
+Assuming node (>=v4) and npm are installed, execute the following shell 
commands.
+
+% npm install atmosphere.js
+% node client.js
+
+This client program supports websocket and sse and allows
+you to choose your preferred protocol.
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/a529d270/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index abe9d3b..353e544 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -32,6 +32,7 @@
 ${project.version}
 
 1.8.5
+2.3.7
 8.1.15.v20140411
 9.2.2.v20140723
 ${cxf.jetty8.version}
@@ -207,6 +208,13 @@
 org.springframework
 spring-core
 
-
+
+
+
+org.atmosphere
+atmosphere-runtime
+${cxf.atmosphere.version}
+
+
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a529d270/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
 
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index 967e978..cc039ff 100644
--- 
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++ 
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -25,6 +25,9 @@ import

[3/8] cxf git commit: fix the test error by adjusting its setup for CXF-5855

2016-04-05 Thread ay

fix the test error by adjusting its setup for CXF-5855


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

Branch: refs/heads/3.1.x-fixes
Commit: 897d81dc292eb6159aab96390cb3fbfed1c34a6b
Parents: a529d27
Author: Akitoshi Yoshida 
Authored: Thu Mar 17 11:17:57 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 13:36:57 2016 +0200

--
 .../websocket/atmosphere/DefaultProtocolInterceptorTest.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/897d81dc/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
--
diff --git 
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
 
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
index e6b70af..1dee1de 100644
--- 
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
+++ 
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
@@ -25,7 +25,10 @@ import java.util.Map;
 
 import org.apache.cxf.transport.websocket.WebSocketUtils;
 import org.atmosphere.cpr.AtmosphereRequest;
+import org.atmosphere.cpr.AtmosphereResource;
+import org.atmosphere.cpr.AtmosphereResourceImpl;
 import org.atmosphere.cpr.AtmosphereResponse;
+import org.atmosphere.cpr.FrameworkConfig;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -40,6 +43,9 @@ public class DefaultProtocolInterceptorTest extends Assert {
 DefaultProtocolInterceptor dpi = new DefaultProtocolInterceptor();
 AtmosphereRequest request = AtmosphereRequest.newInstance();
 AtmosphereResponse response = AtmosphereResponse.newInstance();
+AtmosphereResourceImpl resource = new AtmosphereResourceImpl();
+resource.transport(AtmosphereResource.TRANSPORT.WEBSOCKET);
+request.localAttributes().put(FrameworkConfig.ATMOSPHERE_RESOURCE, 
resource);
 response.request(request);
 String payload = "hello cxf";
 String contentType = "text/plain";

[8/8] cxf git commit: make websocket_osgi sample also work for both karaf 4.0.x (for cxf-3.1.x)

2016-04-05 Thread ay

make websocket_osgi sample also work for both karaf 4.0.x (for cxf-3.1.x)


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

Branch: refs/heads/3.1.x-fixes
Commit: 75edfe9d21fd654d844e24038a72206b4e15457d
Parents: 5ce6827
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 10:38:42 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 14:33:29 2016 +0200

--
 .../samples/jax_rs/websocket_osgi/README.txt| 58 ++--
 .../samples/jax_rs/websocket_osgi/pom.xml   | 10 ++--
 2 files changed, 35 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/75edfe9d/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
index 60d7705..09cf100 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
@@ -16,23 +16,22 @@ Using either UNIX or Windows:
 
 This will produce a war file in the target folder.
 
+Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html.
+You can also use Karaf 4.0.x for this demo.)
 
-Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html)
+$ bin/karaf 
+__ __    
+   / //_/ __ _/ __/  
+  / ,<  / __ `/ ___/ __ `/ /_
+ / /| |/ /_/ / /  / /_/ / __/
+/_/ |_|\__,_/_/   \__,_/_/ 
 
-  bin/karaf
+  Apache Karaf (3.0.4)
 
+Hit '' for a list of available commands
+and '[cmd] --help' for help on a specific command.
+Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf.
 
-  __ __    
- / //_/ __ _/ __/  
-/ ,<  / __ `/ ___/ __ `/ /_
-   / /| |/ /_/ / /  / /_/ / __/
-  /_/ |_|\__,_/_/   \__,_/_/ 
-  
-Apache Karaf (3.0.4)
-  
-  Hit '' for a list of available commands
-  and '[cmd] --help' for help on a specific command.
-  Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf.
 
 
 In order to install CXF's features, you need to add the CXF's features repo 
using
@@ -52,28 +51,29 @@ Install this demo bundle (using the appropriate bundle 
version number)
 
 And verify the bundles are installed.
 
-karaf@root()> feature:repo-add cxf 3.2.0-SNAPSHOT
-Adding feature url 
mvn:org.apache.cxf.karaf/apache-cxf/3.2.0-SNAPSHOT/xml/features
+
+karaf@root()> feature:repo-add cxf 3.1.7-SNAPSHOT
+Adding feature url 
mvn:org.apache.cxf.karaf/apache-cxf/3.1.7-SNAPSHOT/xml/features
 karaf@root()> feature:install cxf-jaxrs cxf-transports-websocket-server
-karaf@root()> list -t 0 | grep CXF
- 80 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Core  
  
- 81 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime Management
  
-100 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime HTTP Transport
  
-102 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Extensions: 
Providers
-103 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Extensions: Search 
  
-104 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Service 
Description  
-105 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime JAX-RS Frontend   
  
-106 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Client 
  
-108 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime WebSocket 
Transport 
-karaf@root()> install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi
+karaf@root()> install -s 
mvn:org.apache.cxf.samples/jax_rs_websocket_osgi/3.1.7-SNAPSHOT
 Bundle ID: 109
+karaf@root()> list -t 0 | grep CXF
+ 80 | Active   |  40 | 3.1.7.SNAPSHOT   | Apache CXF Core  
  
+ 81 | Active   |  40 | 3.1.7.SNAPSHOT   | Apache CXF Runtime Management
  
+100 | Active   |  40 | 3.1.7.SNAPSHOT   | Apache CXF Runtime HTTP Transport
  
+102 | Active   |  40 | 3.1.7.SNAPSHOT   | Apache CXF JAX-RS Extensions: 
Providers
+103 | Active   |  40 | 3.1.7.SNAPSHOT   | Apache CXF JAX-RS

cxf git commit: Upgrade atmosphere to 2.3.7 (for cxf-3.1.x)

2016-04-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d3a97b35a -> 91197fdb2


Upgrade atmosphere to 2.3.7 (for cxf-3.1.x)


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

Branch: refs/heads/3.1.x-fixes
Commit: 91197fdb2cfc52c62f63aae1113b387423c8c387
Parents: d3a97b3
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 13:36:31 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 13:36:31 2016 +0200

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/91197fdb/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 715201a..b9cac8a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,8 +69,8 @@
 5.12.0
 1.9.8
 2.0.0-M21
-2.3.5
-[2.0,3.0)
+2.3.7
+[2.0,2.4)
 1.2.14
 1.54
 2.2_2

cxf git commit: make websocket_osgi sample also work for both karaf 4.0.x

2016-04-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 64e7c75d2 -> b2c10cc6c


make websocket_osgi sample also work for both karaf 4.0.x


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

Branch: refs/heads/master
Commit: b2c10cc6c18a6e6589d258436303c46b3f682f7e
Parents: 64e7c75
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 10:38:42 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 11:04:55 2016 +0200

--
 .../src/main/release/samples/jax_rs/websocket_osgi/README.txt| 4 ++--
 .../src/main/release/samples/jax_rs/websocket_osgi/pom.xml   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b2c10cc6/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
index 60d7705..efc7000 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
@@ -16,8 +16,8 @@ Using either UNIX or Windows:
 
 This will produce a war file in the target folder.
 
-
-Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html)
+Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html.
+You can also use Karaf 4.0.x for this demo.)
 
   bin/karaf
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b2c10cc6/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
index e0d1234..3dac0f3 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
@@ -48,6 +48,8 @@
 
 
${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false
 
+javax.servlet;version="[2.6,4)",
+javax.servlet.http;version="[2.6,4)",
 javax.ws.rs,
 javax.ws.rs.core,
 org.apache.cxf.jaxrs.provider,

cxf git commit: add a blueprint version of websocket sample for karaf

2016-04-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 0b9cb3da9 -> 64e7c75d2


add a blueprint version of websocket sample for karaf


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

Branch: refs/heads/master
Commit: 64e7c75d2176a39abfd9de40196e7c6eb02cf127
Parents: 0b9cb3d
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 10:38:42 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 10:38:42 2016 +0200

--
 .../samples/jax_rs/websocket_osgi/README.txt|  94 +++
 .../samples/jax_rs/websocket_osgi/pom.xml   |  94 +++
 .../main/java/demo/jaxrs/server/Customer.java   |  43 +++
 .../java/demo/jaxrs/server/CustomerService.java | 271 +++
 .../src/main/java/demo/jaxrs/server/Order.java  |  69 +
 .../main/java/demo/jaxrs/server/Product.java|  43 +++
 .../resources/OSGI-INF/blueprint/context.xml|  47 
 .../websocket_osgi/src/test/resources/client.js | 234 
 8 files changed, 895 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/64e7c75d/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
new file mode 100644
index 000..60d7705
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
@@ -0,0 +1,94 @@
+JAX-RS WebSocket OSGi Blueprint Demo 
+=
+
+This is an OSGi Blueprint version of JAX-RS WebSocket Demo.
+
+Building and running the demo using maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the maven pom.xml file can be used to build and run the demo. 
+
+
+Using either UNIX or Windows:
+
+  mvn install
+
+This will produce a war file in the target folder.
+
+
+Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html)
+
+  bin/karaf
+
+
+  __ __    
+ / //_/ __ _/ __/  
+/ ,<  / __ `/ ___/ __ `/ /_
+   / /| |/ /_/ / /  / /_/ / __/
+  /_/ |_|\__,_/_/   \__,_/_/ 
+  
+Apache Karaf (3.0.4)
+  
+  Hit '' for a list of available commands
+  and '[cmd] --help' for help on a specific command.
+  Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf.
+
+
+In order to install CXF's features, you need to add the CXF's features repo 
using
+
+  feature:repo-add cxf 3.n.m
+
+ where 3.n.m corresponds to a valid CXF version number
+
+Install CXF's cxf-jaxrs and cxf-transports-websocket-server features that 
installs all the required bundles
+for this demo bundle.
+
+  feature:install cxf-jaxrs cxf-transports-websocket-server
+
+Install this demo bundle (using the appropriate bundle version number)
+
+  install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi/3.n.m
+
+And verify the bundles are installed.
+
+karaf@root()> feature:repo-add cxf 3.2.0-SNAPSHOT
+Adding feature url 
mvn:org.apache.cxf.karaf/apache-cxf/3.2.0-SNAPSHOT/xml/features
+karaf@root()> feature:install cxf-jaxrs cxf-transports-websocket-server
+karaf@root()> list -t 0 | grep CXF
+ 80 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Core  
  
+ 81 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime Management
  
+100 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime HTTP Transport
  
+102 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Extensions: 
Providers
+103 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Extensions: Search 
  
+104 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Service 
Description  
+105 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime JAX-RS Frontend   
  
+106 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF JAX-RS Client 
  
+108 | Active   |  40 | 3.2.0.SNAPSHOT   | Apache CXF Runtime WebSocket 
Transport 
+karaf@root()> install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi
+Bundle ID: 109
+karaf@root()> list
+START LEVEL 100 , List Threshold: 50
+ ID | State  | Lvl | Version| Name   
+-
+107 | Active |  80 | 2.4.3  |

cxf git commit: use jetty9 in samples/jax_rs/websocket by default

2016-03-30 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master d226c07d4 -> ebce4a65b


use jetty9 in samples/jax_rs/websocket by default


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

Branch: refs/heads/master
Commit: ebce4a65b15a1a99f18c1ea0111affafc447ce7e
Parents: d226c07
Author: Akitoshi Yoshida 
Authored: Wed Mar 30 17:11:34 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Mar 30 17:11:43 2016 +0200

--
 .../src/main/release/samples/jax_rs/websocket/pom.xml| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ebce4a65/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index 12701f2..b894cff 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -41,11 +41,6 @@
 
 
 jetty8
-
-
-!jetty9
-
-
 
 ${cxf.jetty8.version}
 
@@ -60,6 +55,12 @@
 
 
 jetty9
+
+
+
+!jetty8
+
+
 
 ${cxf.jetty9.version}

cxf git commit: forgot to sync atmosphere's version in samples

2016-03-30 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master e4de8e215 -> d226c07d4


forgot to sync atmosphere's version in samples


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

Branch: refs/heads/master
Commit: d226c07d4db15fa9244a2f011df801839a880f68
Parents: e4de8e2
Author: Akitoshi Yoshida 
Authored: Wed Mar 30 16:38:10 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Mar 30 16:39:39 2016 +0200

--
 distribution/src/main/release/samples/jax_rs/websocket/pom.xml | 2 +-
 distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml | 2 +-
 distribution/src/main/release/samples/pom.xml  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d226c07d/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index 9b79c2c..12701f2 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -32,7 +32,7 @@
 ${project.version}
 
 1.8.5
-2.3.7
+2.4.3
 8.1.15.v20140411
 9.2.2.v20140723
 ${cxf.jetty8.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/d226c07d/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 9fed27a..49c4540 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -32,7 +32,7 @@
 
 ${project.version}
 
-2.3.7
+2.4.3
 9.2.15.v20160210
 9.3.5.v20151012
 ${cxf.jetty93.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/d226c07d/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index 393fae2..d7c5587 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -51,6 +51,7 @@
 jax_rs/basic_https
 jax_rs/basic
 jax_rs/websocket
+jax_rs/websocket_web
 jax_rs/search
 jax_rs/description_swagger
 jax_rs/description_swagger2

cxf git commit: upgrade atmosphere to 2.4.3

2016-03-24 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master b3ec59efc -> 66447a377


upgrade atmosphere to 2.4.3


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

Branch: refs/heads/master
Commit: 66447a377f0b2cafc2f337456b5fd41f832556e0
Parents: b3ec59e
Author: Akitoshi Yoshida 
Authored: Thu Mar 24 19:33:49 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Mar 24 19:33:49 2016 +0100

--
 parent/pom.xml|  4 ++--
 .../atmosphere/AtmosphereWebSocketJettyDestination.java   | 10 ++
 .../atmosphere/AtmosphereWebSocketServletDestination.java | 10 ++
 .../websocket/atmosphere/DefaultProtocolInterceptor.java  |  6 --
 .../atmosphere/DefaultProtocolInterceptorTest.java|  6 --
 5 files changed, 22 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/66447a37/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 864df71..28c21cc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,8 +69,8 @@
 5.12.1
 1.9.8
 2.0.0-M21
-2.3.5
-[2.0,3.0)
+2.4.3
+[2.4,3.0)
 1.2.14
 1.54
 2.2_2

http://git-wip-us.apache.org/repos/asf/cxf/blob/66447a37/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
--
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
index d0cc806..8a8ba84 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
@@ -41,9 +41,9 @@ import 
org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
 import org.apache.cxf.transport.websocket.WebSocketDestinationService;
 import org.atmosphere.cpr.ApplicationConfig;
 import org.atmosphere.cpr.AtmosphereFramework;
-import org.atmosphere.cpr.AtmosphereRequest;
+import org.atmosphere.cpr.AtmosphereRequestImpl;
 import org.atmosphere.cpr.AtmosphereResource;
-import org.atmosphere.cpr.AtmosphereResponse;
+import org.atmosphere.cpr.AtmosphereResponseImpl;
 import org.atmosphere.handler.AbstractReflectorAtmosphereHandler;
 import org.eclipse.jetty.server.Request;
 
@@ -65,6 +65,8 @@ public class AtmosphereWebSocketJettyDestination extends 
JettyHTTPDestination im
 framework.addInitParameter(ApplicationConfig.PROPERTY_SESSION_SUPPORT, 
"true");
 framework.addInitParameter(ApplicationConfig.WEBSOCKET_SUPPORT, 
"true");
 
framework.addInitParameter(ApplicationConfig.WEBSOCKET_PROTOCOL_EXECUTION, 
"true");
+// workaround for atmosphere's jsr356 initialization requiring 
servletConfig
+
framework.addInitParameter(ApplicationConfig.WEBSOCKET_SUPPRESS_JSR356, "true");
 AtmosphereUtils.addInterceptors(framework, bus);
 framework.addAtmosphereHandler("/", new DestinationHandler());
 framework.init();
@@ -120,8 +122,8 @@ public class AtmosphereWebSocketJettyDestination extends 
JettyHTTPDestination im
HttpServletResponse response) throws IOException, 
ServletException {
 if (AtmosphereUtils.useAtmosphere(request)) {
 try {
-framework.doCometSupport(AtmosphereRequest.wrap(request), 
- 
AtmosphereResponse.wrap(response));
+
framework.doCometSupport(AtmosphereRequestImpl.wrap(request), 
+ 
AtmosphereResponseImpl.wrap(response));
 baseRequest.setHandled(true);
 } catch (ServletException e) {
 throw new IOException(e);

http://git-wip-us.apache.org/repos/asf/cxf/blob/66447a37/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
--
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java

cxf git commit: add a webapp version of samples/jax_rs/websocket

2016-03-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 1b01938aa -> b3ec59efc


add a webapp version of samples/jax_rs/websocket


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

Branch: refs/heads/master
Commit: b3ec59efcd10cf64a1bb8a399082071905f5baa9
Parents: 1b01938
Author: Akitoshi Yoshida 
Authored: Wed Mar 23 14:40:00 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Mar 23 14:54:18 2016 +0100

--
 .../samples/jax_rs/websocket_web/README.txt |  32 +++
 .../samples/jax_rs/websocket_web/pom.xml| 123 +
 .../main/java/demo/jaxrs/server/Customer.java   |  43 +++
 .../java/demo/jaxrs/server/CustomerService.java | 271 +++
 .../src/main/java/demo/jaxrs/server/Order.java  |  69 +
 .../main/java/demo/jaxrs/server/Product.java|  43 +++
 .../src/main/webapp/WEB-INF/beans.xml   |  46 
 .../src/main/webapp/WEB-INF/web.xml |  42 +++
 8 files changed, 669 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b3ec59ef/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
new file mode 100644
index 000..36008ed
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
@@ -0,0 +1,32 @@
+JAX-RS WebSocket WebApp Demo 
+=
+
+This is an WebApp version of JAX-RS WebSocket Demo.
+
+Building and running the demo using maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the maven pom.xml file can be used to build and run the demo. 
+
+
+Using either UNIX or Windows:
+
+  mvn install
+
+This will produce a war file in the target folder.
+
+To run the war file using jetty9
+
+  mvn jetty:run-war  (from one command line window)
+
+To run the war file using tomcat7
+
+  mvn tomcat7:run-war  (from one command line window)
+
+To remove the target dir, run mvn clean".
+
+
+You can use the same clients included in JAX-RS WebSockt Demo.
+Refer to samples/jax_rs/websocket/README.txt for more information.
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/b3ec59ef/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
new file mode 100644
index 000..9fed27a
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -0,0 +1,123 @@
+
+
+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
+jax_rs_websocket_web
+JAX-RS WebSocket Demo
+JAX-RS WebSocket WebApp Demo
+war
+
+org.apache.cxf.samples
+cxf-samples
+3.2.0-SNAPSHOT
+../..
+
+
+${project.version}
+
+2.3.7
+9.2.15.v20160210
+9.3.5.v20151012
+${cxf.jetty93.version}
+
+
+
+
+org.eclipse.jetty
+jetty-maven-plugin
+${cxf.jetty.version}
+
+
${project.build.directory}/${project.name}
+1
+
+9000
+
+
+/
+
+
+
+
+org.apache.tomcat.maven
+tomcat7-maven-plugin
+2.2
+
+
${project.build.directory}/${project.artifactId}
+9000
+/
+
+
+
+run-tomcat
+
+true
+
+
+run
+
+
+
+
+
+
+
+
+
+org.apache.cxf
+cxf-rt-transports-http
+3.2.0-SNAPSHOT
+
+
+org.apache.cxf
+cxf-rt-transports-websocket
+3.2.0-SNAPSHOT
+
+
+org.apache.cxf
+

cxf git commit: use a non-empty context-path for samples/jax_rs/websocket sample

2016-03-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master ac9b9b189 -> 5f4317c54


use a non-empty context-path for samples/jax_rs/websocket sample


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

Branch: refs/heads/master
Commit: 5f4317c540b753b224fd9fa44478cabe58da0858
Parents: ac9b9b1
Author: Akitoshi Yoshida 
Authored: Wed Mar 23 14:23:03 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Mar 23 14:24:12 2016 +0100

--
 .../release/samples/jax_rs/websocket/README.txt | 26 -
 .../src/main/java/demo/jaxrs/client/Client.java | 29 ---
 .../src/main/java/demo/jaxrs/server/Server.java |  4 ++-
 .../websocket/src/main/resources/index.html |  4 +--
 .../websocket/src/test/resources/client.js  | 30 +++-
 5 files changed, 46 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5f4317c5/distribution/src/main/release/samples/jax_rs/websocket/README.txt
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
index f1d3455..8df709e 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
@@ -3,7 +3,7 @@ JAX-RS WebSocket Demo
 
 This is a websocket transport version of JAX-RS Basic Demo.
 
-A RESTful customer service is provided on URL ws://localhost:9000/customers. 
+A RESTful customer service is provided on URL ws://localhost:9000/demo
 Users access this URI to operate on customer.
 
 This sample includes two convenient clients: a plain javascript browser client
@@ -13,12 +13,12 @@ and a node.js client based on atmosphere.
 Connecting to the server
 ---
 
-Open a websocket to ws://localhost:9000/ and send requests over the websocket.
+Open a websocket to ws://localhost:9000/demo and send requests over the 
websocket.
 
-A GET request to path /customerservice/customers/123
+A GET request to path /demo/customerservice/customers/123
 
 
-GET /customerservice/customers/123
+GET /demo/customerservice/customers/123
 
 
 returns a customer instance whose id is 123. The XML document returned:
@@ -30,10 +30,10 @@ returns a customer instance whose id is 123. The XML 
document returned:
 
 
 
-A GET request to path /customerservice/orders/223/products/323
+A GET request to path /demo/customerservice/orders/223/products/323
 
 
-GET /customerservice/orders/223/products/323
+GET /demo/customerservice/orders/223/products/323
 
 
 returns product 323 that belongs to order 223. The XML document returned:
@@ -48,7 +48,7 @@ returns product 323 that belongs to order 223. The XML 
document returned:
 A POST request to path /customerservice/customers
 
 
-POST /customerservice/customers
+POST /demo/customerservice/customers
 Content-Type: text/xml; charset="utf-8"
 
 
@@ -63,7 +63,7 @@ with the data:
 adds a customer whose name is Jack 
 
 
-A PUT request to path /customerservice/customers
+A PUT request to path /demo/customerservice/customers
 
 
 PUT /customerservice/customers
@@ -82,20 +82,20 @@ with the data:
 updates the customer instance whose id is 123
 
 
-A GET request to path /monitor with id monitor-12345
+A GET request to path /demo/monitor with id monitor-12345
 
 
-GET /customerservice/monitor
+GET /demo/customerservice/monitor
 requestId: monitor-12345
 
 
 returns a continuous event stream on the customer
 activities. Try invoking some customer related operations.
 
-A GET request to path /unmonitor with id monitor-12345
+A GET request to path /demo/unmonitor with id monitor-12345
 
 
-GET /customerservice/unmonitor/monitor-12345
+GET /demo/customerservice/unmonitor/monitor-12345

cxf git commit: [CXF-5855] enable atmosphere's sse handling; update the sample

2016-03-19 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master f492f92e5 -> 4f5b60aba


[CXF-5855] enable atmosphere's sse handling; update the sample


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

Branch: refs/heads/master
Commit: 4f5b60aba0a8f9f56c7f16e8a93ef22876467678
Parents: f492f92
Author: Akitoshi Yoshida 
Authored: Thu Mar 17 00:11:58 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Mar 17 00:15:29 2016 +0100

--
 .../release/samples/jax_rs/websocket/README.txt |  26 ++-
 .../release/samples/jax_rs/websocket/pom.xml|  10 +-
 .../java/demo/jaxrs/server/CustomerService.java | 105 -
 .../websocket/src/test/resources/client.js  | 232 +++
 .../websocket/atmosphere/AtmosphereUtils.java   |  18 ++
 .../AtmosphereWebSocketJettyDestination.java|   3 +-
 .../AtmosphereWebSocketServletDestination.java  |   3 +-
 .../atmosphere/DefaultProtocolInterceptor.java  |  90 ++-
 8 files changed, 463 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4f5b60ab/distribution/src/main/release/samples/jax_rs/websocket/README.txt
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/README.txt 
b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
index 09c43e8..f1d3455 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
@@ -6,6 +6,13 @@ This is a websocket transport version of JAX-RS Basic Demo.
 A RESTful customer service is provided on URL ws://localhost:9000/customers. 
 Users access this URI to operate on customer.
 
+This sample includes two convenient clients: a plain javascript browser client
+and a node.js client based on atmosphere.
+
+
+Connecting to the server
+---
+
 Open a websocket to ws://localhost:9000/ and send requests over the websocket.
 
 A GET request to path /customerservice/customers/123
@@ -102,7 +109,6 @@ Please review the README in the samples directory before
 continuing.
 
 
-
 Building and running the demo using maven
 ---
 
@@ -118,6 +124,8 @@ Using either UNIX or Windows:
 
 To remove the target dir, run mvn clean".
 
+Using Javascript client in Browser
+
 Using a web browser that natively supports WebSocket (Safari, Chrome, Firefox):
 After starting the server (see above), open the index.html page located at
 
@@ -140,3 +148,19 @@ Content-Type: text/xml; charset="utf-8"
   Jack
 
 
+
+
+Using Node.js client 
+
+
+Go to samples/jax_rs/websocket/src/test/resources and at the console
+
+Assuming node (>=v4) and npm are installed, execute the following shell 
commands.
+
+% npm install atmosphere.js
+% node client.js
+
+This client program supports websocket and sse and allows
+you to choose your preferred protocol.
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/4f5b60ab/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index d198d71..9b79c2c 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -32,6 +32,7 @@
 ${project.version}
 
 1.8.5
+2.3.7
 8.1.15.v20140411
 9.2.2.v20140723
 ${cxf.jetty8.version}
@@ -207,6 +208,13 @@
 org.springframework
 spring-core
 
-
+
+
+
+org.atmosphere
+atmosphere-runtime
+${cxf.atmosphere.version}
+
+
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4f5b60ab/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
 
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index 967e978..cc039ff 100644
--- 
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++

cxf git commit: add the stacktrace output in CustomerService for CXF-5855

2016-03-19 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 5404ada11 -> 62ca4018b


add the stacktrace output in CustomerService for CXF-5855


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

Branch: refs/heads/master
Commit: 62ca4018bcdd7ea71df23dbf5111a553780ba2c8
Parents: 5404ada
Author: Akitoshi Yoshida 
Authored: Thu Mar 17 10:08:25 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Mar 17 10:08:25 2016 +0100

--
 .../src/main/java/demo/jaxrs/server/CustomerService.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/62ca4018/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
 
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index cc039ff..f77f8aa 100644
--- 
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++ 
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -186,6 +186,8 @@ public class CustomerService {
 } catch (IOException e) {
 System.out.println("error writing to " + 
wh.getValue() + " " + wh.get());
 if (wh.increment()) {
+// the max error count reached; purging the 
output resource
+e.printStackTrace();
 try {
 wh.getValue().close();
 } catch (IOException e2) {
@@ -205,6 +207,8 @@ public class CustomerService {
 } catch (IOException e) {
 System.out.println("error writing to " + 
wh.getValue() + " " + wh.get());
 if (wh.increment()) {
+// the max error count reached; purging the 
output resource
+e.printStackTrace();
 try {
 wh.getValue().getOutputStream().close();
 } catch (IOException e2) {

cxf git commit: fix the test error by adjusting its setup for CXF-5855

2016-03-19 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 62ca4018b -> aafcec2b3


fix the test error by adjusting its setup for CXF-5855


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

Branch: refs/heads/master
Commit: aafcec2b3466bddb4c0de34417391c9c3d595b77
Parents: 62ca401
Author: Akitoshi Yoshida 
Authored: Thu Mar 17 11:17:57 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Mar 17 11:17:57 2016 +0100

--
 .../websocket/atmosphere/DefaultProtocolInterceptorTest.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/aafcec2b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
--
diff --git 
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
 
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
index e6b70af..1dee1de 100644
--- 
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
+++ 
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
@@ -25,7 +25,10 @@ import java.util.Map;
 
 import org.apache.cxf.transport.websocket.WebSocketUtils;
 import org.atmosphere.cpr.AtmosphereRequest;
+import org.atmosphere.cpr.AtmosphereResource;
+import org.atmosphere.cpr.AtmosphereResourceImpl;
 import org.atmosphere.cpr.AtmosphereResponse;
+import org.atmosphere.cpr.FrameworkConfig;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -40,6 +43,9 @@ public class DefaultProtocolInterceptorTest extends Assert {
 DefaultProtocolInterceptor dpi = new DefaultProtocolInterceptor();
 AtmosphereRequest request = AtmosphereRequest.newInstance();
 AtmosphereResponse response = AtmosphereResponse.newInstance();
+AtmosphereResourceImpl resource = new AtmosphereResourceImpl();
+resource.transport(AtmosphereResource.TRANSPORT.WEBSOCKET);
+request.localAttributes().put(FrameworkConfig.ATMOSPHERE_RESOURCE, 
resource);
 response.request(request);
 String payload = "hello cxf";
 String contentType = "text/plain";

cxf git commit: [CXF-5855] enable atmosphere's sse handling; update the sample

2016-03-19 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 4f5b60aba -> 5404ada11


[CXF-5855] enable atmosphere's sse handling; update the sample


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

Branch: refs/heads/master
Commit: 5404ada11eb5f78828a0b480601b3ab01ebcdf10
Parents: 4f5b60a
Author: Akitoshi Yoshida 
Authored: Thu Mar 17 00:11:58 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Mar 17 00:41:07 2016 +0100

--
 .../jax_rs/websocket/src/test/resources/client.js | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5404ada1/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
 
b/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
index 7eb55f3..8e8d653 100644
--- 
a/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
+++ 
b/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
@@ -8,7 +8,7 @@
 
 "use strict";
 
-var HOST_URL = 'http://localhost:9100/';
+var HOST_URL = 'http://localhost:9000/';
 
 var reader = require('readline');
 var prompt = reader.createInterface(process.stdin, process.stdout);
@@ -25,13 +25,13 @@ var isopen = false;
 const TRANSPORT_NAMES = ["websocket", "sse"];
 
 const COMMAND_LIST = 
-[["add name",   "Add a new consumer and return the customer 
instance."],
- ["delete id",  "Delete the customer."],
- ["get id", "Return the customere."],
+[["add name",   "Add a new consumer and return the customer instance. 
(e.g., add green)"],
+ ["delete id",  "Delete the customer. (e.g., delete 124)"],
+ ["get id", "Return the customere. (e.g., get 123)"],
  ["quit",   "Quit the application."],
- ["subscribe",  "Subscribe to the customer updatese."],
- ["unsubscribe","Unsubscribe from the customer updatese."],
- ["update id name", "Update the customer."]];
+ ["subscribe",  "Subscribe to the customer queries."],
+ ["unsubscribe","Unsubscribe from the customer queries."],
+ ["update id name", "Update the customer. (e.g., update 125 red)"]];
 
 function selectOption(c, opts) {
 var i = parseInt(c);

cxf git commit: change the warning-log condition to handle both wsam-namespaces equally

2016-02-02 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 53a462058 -> 62ebb2a0b


change the warning-log condition to handle both wsam-namespaces equally


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

Branch: refs/heads/master
Commit: 62ebb2a0b5f0f9683dcb3a62f03a8e4eaf6da736
Parents: 53a4620
Author: Akitoshi Yoshida 
Authored: Tue Feb 2 18:51:43 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Feb 2 18:52:10 2016 +0100

--
 .../cxf/ws/addressing/policy/AddressingAssertionBuilder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/62ebb2a0/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
index e49dac9..318463d 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
@@ -85,8 +85,8 @@ public class AddressingAssertionBuilder implements 
AssertionBuilder {
   policy);
 }
 }.build(elem, factory);
-if 
(!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) {
-// this happens when neethi fails to recognize the specified 
addressing policy
+if (!(nap instanceof PolicyContainingPrimitiveAssertion || nap 
instanceof PrimitiveAssertion)) {
+// this happens when neethi fails to recognize the specified 
addressing policy element
 LOG.warning("Unable to recognize the addressing policy");
 }
 return nap;

[2/2] cxf git commit: change the warning-log condition to handle both wsam-namespaces equally

2016-02-02 Thread ay

change the warning-log condition to handle both wsam-namespaces equally


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

Branch: refs/heads/3.0.x-fixes
Commit: 5329ac50f77f29c2b5a26427d0af0fcf6a6cb7dd
Parents: d4d75a0
Author: Akitoshi Yoshida 
Authored: Tue Feb 2 18:51:43 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Feb 2 19:10:40 2016 +0100

--
 .../cxf/ws/addressing/policy/AddressingAssertionBuilder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5329ac50/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
index e49dac9..318463d 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
@@ -85,8 +85,8 @@ public class AddressingAssertionBuilder implements 
AssertionBuilder {
   policy);
 }
 }.build(elem, factory);
-if 
(!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) {
-// this happens when neethi fails to recognize the specified 
addressing policy
+if (!(nap instanceof PolicyContainingPrimitiveAssertion || nap 
instanceof PrimitiveAssertion)) {
+// this happens when neethi fails to recognize the specified 
addressing policy element
 LOG.warning("Unable to recognize the addressing policy");
 }
 return nap;

[1/2] cxf git commit: log warning when the addressing policy's namespace is not normalized

2016-02-02 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 0efd99c5e -> 5329ac50f


log warning when the addressing policy's namespace is not normalized


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

Branch: refs/heads/3.0.x-fixes
Commit: d4d75a09cc8438a122e8e9ff57eaef8edef2fb44
Parents: 0efd99c
Author: Akitoshi Yoshida 
Authored: Tue Feb 2 15:42:49 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Feb 2 15:50:22 2016 +0100

--
 .../ws/addressing/policy/AddressingAssertionBuilder.java  | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d4d75a09/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
index 4f147e3..e49dac9 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
@@ -20,12 +20,14 @@
 package org.apache.cxf.ws.addressing.policy;
 
 import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
 import org.apache.neethi.Assertion;
@@ -39,6 +41,8 @@ import 
org.apache.neethi.builders.xml.XMLPrimitiveAssertionBuilder;
  * 
  */
 public class AddressingAssertionBuilder implements AssertionBuilder {
+private static final Logger LOG = 
+LogUtils.getL7dLogger(AddressingAssertionBuilder.class);
 
 private static final QName[] KNOWN_ELEMENTS = {
 MetadataConstants.ADDRESSING_ASSERTION_QNAME,
@@ -80,7 +84,11 @@ public class AddressingAssertionBuilder implements 
AssertionBuilder {
   mp,
   policy);
 }
-} .build(elem, factory); 
+}.build(elem, factory);
+if 
(!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) {
+// this happens when neethi fails to recognize the specified 
addressing policy
+LOG.warning("Unable to recognize the addressing policy");
+}
 return nap;
 } else if (MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME.equals(qn)
 || 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705.equals(qn)) {

cxf git commit: change the warning-log condition to handle both wsam-namespaces equally

2016-02-02 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 8709d976f -> d26f7af22


change the warning-log condition to handle both wsam-namespaces equally


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

Branch: refs/heads/3.1.x-fixes
Commit: d26f7af22662873b43e26a40e21477c0546ca13c
Parents: 8709d97
Author: Akitoshi Yoshida 
Authored: Tue Feb 2 18:51:43 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Feb 2 19:06:58 2016 +0100

--
 .../cxf/ws/addressing/policy/AddressingAssertionBuilder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d26f7af2/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
index e49dac9..318463d 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
@@ -85,8 +85,8 @@ public class AddressingAssertionBuilder implements 
AssertionBuilder {
   policy);
 }
 }.build(elem, factory);
-if 
(!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) {
-// this happens when neethi fails to recognize the specified 
addressing policy
+if (!(nap instanceof PolicyContainingPrimitiveAssertion || nap 
instanceof PrimitiveAssertion)) {
+// this happens when neethi fails to recognize the specified 
addressing policy element
 LOG.warning("Unable to recognize the addressing policy");
 }
 return nap;

cxf git commit: log warning when the addressing policy's namespace is not normalized

2016-02-02 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes f183b9f00 -> cb815b823


log warning when the addressing policy's namespace is not normalized


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

Branch: refs/heads/3.1.x-fixes
Commit: cb815b823006e26ccd8f06c0a75aaa1f23c889b7
Parents: f183b9f
Author: Akitoshi Yoshida 
Authored: Tue Feb 2 15:42:49 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Feb 2 15:47:12 2016 +0100

--
 .../ws/addressing/policy/AddressingAssertionBuilder.java  | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cb815b82/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
index 662b819..e49dac9 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
@@ -20,12 +20,14 @@
 package org.apache.cxf.ws.addressing.policy;
 
 import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
 import org.apache.neethi.Assertion;
@@ -39,6 +41,8 @@ import 
org.apache.neethi.builders.xml.XMLPrimitiveAssertionBuilder;
  * 
  */
 public class AddressingAssertionBuilder implements AssertionBuilder {
+private static final Logger LOG = 
+LogUtils.getL7dLogger(AddressingAssertionBuilder.class);
 
 private static final QName[] KNOWN_ELEMENTS = {
 MetadataConstants.ADDRESSING_ASSERTION_QNAME,
@@ -80,7 +84,11 @@ public class AddressingAssertionBuilder implements 
AssertionBuilder {
   mp,
   policy);
 }
-}.build(elem, factory); 
+}.build(elem, factory);
+if 
(!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) {
+// this happens when neethi fails to recognize the specified 
addressing policy
+LOG.warning("Unable to recognize the addressing policy");
+}
 return nap;
 } else if (MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME.equals(qn)
 || 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705.equals(qn)) {

cxf git commit: log warning when the addressing policy's namespace is not normalized

2016-02-02 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master abcc137cb -> 68c201f36


log warning when the addressing policy's namespace is not normalized


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

Branch: refs/heads/master
Commit: 68c201f362df013cb2c08f0a5a9bd3eaba555710
Parents: abcc137
Author: Akitoshi Yoshida 
Authored: Tue Feb 2 15:42:49 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Feb 2 15:42:49 2016 +0100

--
 .../ws/addressing/policy/AddressingAssertionBuilder.java  | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/68c201f3/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
index 662b819..e49dac9 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
@@ -20,12 +20,14 @@
 package org.apache.cxf.ws.addressing.policy;
 
 import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
 import org.apache.neethi.Assertion;
@@ -39,6 +41,8 @@ import 
org.apache.neethi.builders.xml.XMLPrimitiveAssertionBuilder;
  * 
  */
 public class AddressingAssertionBuilder implements AssertionBuilder {
+private static final Logger LOG = 
+LogUtils.getL7dLogger(AddressingAssertionBuilder.class);
 
 private static final QName[] KNOWN_ELEMENTS = {
 MetadataConstants.ADDRESSING_ASSERTION_QNAME,
@@ -80,7 +84,11 @@ public class AddressingAssertionBuilder implements 
AssertionBuilder {
   mp,
   policy);
 }
-}.build(elem, factory); 
+}.build(elem, factory);
+if 
(!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) {
+// this happens when neethi fails to recognize the specified 
addressing policy
+LOG.warning("Unable to recognize the addressing policy");
+}
 return nap;
 } else if (MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME.equals(qn)
 || 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705.equals(qn)) {

cxf git commit: remove unused code for handling wsa-2007/05 namespace

2016-01-20 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e792331d7 -> c560e2814


remove unused code for handling wsa-2007/05 namespace


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

Branch: refs/heads/3.0.x-fixes
Commit: c560e281409aa0ac327690c1fcec8ad64ecd733b
Parents: e792331
Author: Akitoshi Yoshida 
Authored: Tue Jan 19 19:01:54 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Jan 20 10:37:32 2016 +0100

--
 .../apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c560e281/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index 15ca563..c746896 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -309,12 +309,10 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
 }
 }
 }
@@ -348,18 +346,13 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 if (onlyAnonymous) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 } else if (!hasAnonymous) {
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
 }
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-if (onlyAnonymous) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-} else if (!hasAnonymous) {
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
-}
 }
 }
 if (!MessageUtils.isRequestor(message) && 
!MessageUtils.isOutbound(message)) {

cxf git commit: remove unused code for handling wsa-2007/05 namespace

2016-01-20 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 737202fa0 -> fe82a0366


remove unused code for handling wsa-2007/05 namespace


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

Branch: refs/heads/3.1.x-fixes
Commit: fe82a0366018080845bf4c07ccc87c56382173b0
Parents: 737202f
Author: Akitoshi Yoshida 
Authored: Tue Jan 19 19:01:54 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Jan 19 19:07:15 2016 +0100

--
 .../apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fe82a036/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index afa174e..7e166b2 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -301,12 +301,10 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
 }
 }
 }
@@ -340,18 +338,13 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 if (onlyAnonymous) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 } else if (!hasAnonymous) {
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
 }
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-if (onlyAnonymous) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-} else if (!hasAnonymous) {
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
-}
 }
 }
 if (!MessageUtils.isRequestor(message) && 
!MessageUtils.isOutbound(message)) {

cxf git commit: remove unused code for handling wsa-2007/05 namespace

2016-01-19 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 656662827 -> b0227b307


remove unused code for handling wsa-2007/05 namespace


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

Branch: refs/heads/master
Commit: b0227b307c453a750215c59438a896afaccb333b
Parents: 6566628
Author: Akitoshi Yoshida 
Authored: Tue Jan 19 19:01:54 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Jan 19 19:03:56 2016 +0100

--
 .../apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b0227b30/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
--
diff --git 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index afa174e..7e166b2 100644
--- 
a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++ 
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -301,12 +301,10 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
 }
 }
 }
@@ -340,18 +338,13 @@ public class MAPAggregatorImpl extends MAPAggregator {
 
 for (QName type : types) {
 assertAssertion(aim, type);
+// ADDRESSING_ASSERTION is normalized, so check only the default 
namespace
 if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) {
 if (onlyAnonymous) {
 assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
 } else if (!hasAnonymous) {
 assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
 }
-} else if 
(type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) {
-if (onlyAnonymous) {
-assertAssertion(aim, 
MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
-} else if (!hasAnonymous) {
-assertAssertion(aim, 
MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
-}
 }
 }
 if (!MessageUtils.isRequestor(message) && 
!MessageUtils.isOutbound(message)) {

cxf git commit: adding another test case for wsam-2007/05 namespace

2016-01-19 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c9286efa3 -> e792331d7


adding another test case for wsam-2007/05 namespace


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

Branch: refs/heads/3.0.x-fixes
Commit: e792331d75fbcebfb865f2fe2b382be817c52467
Parents: c9286ef
Author: Akitoshi Yoshida 
Authored: Tue Jan 19 13:28:55 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Jan 19 19:05:52 2016 +0100

--
 .../ws/policy/NestedAddressingPolicyTest.java   | 33 +++-
 1 file changed, 32 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e792331d/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
index dd6e63e..8890e07 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
@@ -33,6 +33,8 @@ import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.addressing.impl.MAPAggregatorImpl;
+import org.apache.cxf.ws.addressing.soap.MAPCodec;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -82,7 +84,7 @@ public class NestedAddressingPolicyTest extends 
AbstractBusClientServerTestBase
 }
  
 @Test
-public void greetMe() throws Exception {
+public void greetMe() throws Exception {
 
 // use a plain client
 
@@ -110,4 +112,33 @@ public class NestedAddressingPolicyTest extends 
AbstractBusClientServerTestBase
 }
 ((Closeable)greeter).close();
 }
+
+@Test
+public void greetMeWSA() throws Exception {
+// use a wsa-enabled client
+
+SpringBusFactory bf = new SpringBusFactory();
+bus = bf.createBus();
+BusFactory.setDefaultBus(bus);
+
+BasicGreeterService gs = new BasicGreeterService();
+final Greeter greeter = gs.getGreeterPort();
+
+updateAddressPort(greeter, PORT);
+LoggingInInterceptor in = new LoggingInInterceptor();
+LoggingOutInterceptor out = new LoggingOutInterceptor();
+MAPCodec mapCodec = new MAPCodec();
+MAPAggregatorImpl mapAggregator = new MAPAggregatorImpl();
+
+bus.getInInterceptors().add(in);
+bus.getInInterceptors().add(mapCodec);
+bus.getInInterceptors().add(mapAggregator);
+bus.getOutInterceptors().add(out);
+bus.getOutInterceptors().add(mapCodec);
+bus.getOutInterceptors().add(mapAggregator);
+
+String s = greeter.greetMe("mytest");
+assertEquals("MYTEST", s);
+((Closeable)greeter).close();
+}
 }
\ No newline at end of file

cxf git commit: adding another test case for wsam-2007/05 namespace

2016-01-19 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes f50ef4210 -> 737202fa0


adding another test case for wsam-2007/05 namespace


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

Branch: refs/heads/3.1.x-fixes
Commit: 737202fa09b75c1bf1e8668ff40d4b2cb41ea141
Parents: f50ef42
Author: Akitoshi Yoshida 
Authored: Tue Jan 19 13:28:55 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Jan 19 19:05:10 2016 +0100

--
 .../ws/policy/NestedAddressingPolicyTest.java   | 33 +++-
 1 file changed, 32 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/737202fa/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
index dd6e63e..8890e07 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
@@ -33,6 +33,8 @@ import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.addressing.impl.MAPAggregatorImpl;
+import org.apache.cxf.ws.addressing.soap.MAPCodec;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -82,7 +84,7 @@ public class NestedAddressingPolicyTest extends 
AbstractBusClientServerTestBase
 }
  
 @Test
-public void greetMe() throws Exception {
+public void greetMe() throws Exception {
 
 // use a plain client
 
@@ -110,4 +112,33 @@ public class NestedAddressingPolicyTest extends 
AbstractBusClientServerTestBase
 }
 ((Closeable)greeter).close();
 }
+
+@Test
+public void greetMeWSA() throws Exception {
+// use a wsa-enabled client
+
+SpringBusFactory bf = new SpringBusFactory();
+bus = bf.createBus();
+BusFactory.setDefaultBus(bus);
+
+BasicGreeterService gs = new BasicGreeterService();
+final Greeter greeter = gs.getGreeterPort();
+
+updateAddressPort(greeter, PORT);
+LoggingInInterceptor in = new LoggingInInterceptor();
+LoggingOutInterceptor out = new LoggingOutInterceptor();
+MAPCodec mapCodec = new MAPCodec();
+MAPAggregatorImpl mapAggregator = new MAPAggregatorImpl();
+
+bus.getInInterceptors().add(in);
+bus.getInInterceptors().add(mapCodec);
+bus.getInInterceptors().add(mapAggregator);
+bus.getOutInterceptors().add(out);
+bus.getOutInterceptors().add(mapCodec);
+bus.getOutInterceptors().add(mapAggregator);
+
+String s = greeter.greetMe("mytest");
+assertEquals("MYTEST", s);
+((Closeable)greeter).close();
+}
 }
\ No newline at end of file

cxf git commit: adding another test case for wsam-2007/05 namespace

2016-01-19 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master a494f3f4c -> 0e2647c07


adding another test case for wsam-2007/05 namespace


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

Branch: refs/heads/master
Commit: 0e2647c078b2ee427979cb76abb63afe3fe4f939
Parents: a494f3f
Author: Akitoshi Yoshida 
Authored: Tue Jan 19 13:28:55 2016 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Jan 19 13:35:12 2016 +0100

--
 .../ws/policy/NestedAddressingPolicyTest.java   | 33 +++-
 1 file changed, 32 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0e2647c0/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
index dd6e63e..8890e07 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
@@ -33,6 +33,8 @@ import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.addressing.impl.MAPAggregatorImpl;
+import org.apache.cxf.ws.addressing.soap.MAPCodec;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -82,7 +84,7 @@ public class NestedAddressingPolicyTest extends 
AbstractBusClientServerTestBase
 }
  
 @Test
-public void greetMe() throws Exception {
+public void greetMe() throws Exception {
 
 // use a plain client
 
@@ -110,4 +112,33 @@ public class NestedAddressingPolicyTest extends 
AbstractBusClientServerTestBase
 }
 ((Closeable)greeter).close();
 }
+
+@Test
+public void greetMeWSA() throws Exception {
+// use a wsa-enabled client
+
+SpringBusFactory bf = new SpringBusFactory();
+bus = bf.createBus();
+BusFactory.setDefaultBus(bus);
+
+BasicGreeterService gs = new BasicGreeterService();
+final Greeter greeter = gs.getGreeterPort();
+
+updateAddressPort(greeter, PORT);
+LoggingInInterceptor in = new LoggingInInterceptor();
+LoggingOutInterceptor out = new LoggingOutInterceptor();
+MAPCodec mapCodec = new MAPCodec();
+MAPAggregatorImpl mapAggregator = new MAPAggregatorImpl();
+
+bus.getInInterceptors().add(in);
+bus.getInInterceptors().add(mapCodec);
+bus.getInInterceptors().add(mapAggregator);
+bus.getOutInterceptors().add(out);
+bus.getOutInterceptors().add(mapCodec);
+bus.getOutInterceptors().add(mapAggregator);
+
+String s = greeter.greetMe("mytest");
+assertEquals("MYTEST", s);
+((Closeable)greeter).close();
+}
 }
\ No newline at end of file

cxf git commit: [CXF-6720] AbstractHTTPDestination#WrappedOutputStream.close() calls flush after close

2016-01-07 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 80018b74a -> e35cfb946


[CXF-6720] AbstractHTTPDestination#WrappedOutputStream.close() calls flush 
after close


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

Branch: refs/heads/master
Commit: e35cfb9469e7de7355ef412e6c97597d6aa7cff5
Parents: 80018b7
Author: Akitoshi Yoshida 
Authored: Thu Jan 7 21:26:22 2016 +0900
Committer: Akitoshi Yoshida 
Committed: Thu Jan 7 21:26:22 2016 +0900

--
 .../org/apache/cxf/transport/http/AbstractHTTPDestination.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e35cfb94/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index 0861e6e..d79e75b 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -802,8 +802,8 @@ public abstract class AbstractHTTPDestination
 }
 }
 if (wrappedStream != null) {
+// closing the stream should indirectly call the servlet 
response's flushBuffer
 wrappedStream.close();
-response.flushBuffer();
 }
 /*
 try {

cxf git commit: adding a ws-addr policy test using wsam-2007/05 namespace

2015-12-28 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3aa4959dd -> dcc7914dc


adding a ws-addr policy test using wsam-2007/05 namespace


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

Branch: refs/heads/3.1.x-fixes
Commit: dcc7914dc30dc5b05a817e60bb6cf9e8f2635945
Parents: 3aa4959
Author: Akitoshi Yoshida 
Authored: Tue Dec 29 00:49:19 2015 +0900
Committer: Akitoshi Yoshida 
Committed: Tue Dec 29 01:00:30 2015 +0900

--
 .../ws/policy/AddressingPolicy0705Test.java | 161 +++
 .../cxf/systest/ws/policy/addr-external0705.xml |  37 +
 .../apache/cxf/systest/ws/policy/addr0705.xml   |  31 
 3 files changed, 229 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/dcc7914d/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
new file mode 100644
index 000..405c60c
--- /dev/null
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
@@ -0,0 +1,161 @@
+/**
+ * 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.systest.ws.policy;
+
+import java.io.Closeable;
+import java.util.logging.Logger;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.greeter_control.BasicGreeterService;
+import org.apache.cxf.greeter_control.Greeter;
+import org.apache.cxf.greeter_control.PingMeFault;
+import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.systest.ws.util.ConnectionHelper;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.TestUtil;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+/**
+ * Tests the use of the WS-Policy Framework to automatically engage 
WS-Addressing and
+ * WS-RM in response to Policies defined for the endpoint via an external 
policy attachment.
+ */
+// REVISIT this class is copied from AddressingPolicyTest to use the 
wsam-2007/05 namespace
+// consolidate this class with the original
+public class AddressingPolicy0705Test extends AbstractBusClientServerTestBase {
+public static final String PORT = allocatePort(Server.class);
+public static final String TEMPDIR = 
FileUtils.getDefaultTempDir().toURI().toString(); 
+
+private static final Logger LOG = 
LogUtils.getLogger(AddressingPolicy0705Test.class);
+
+public static class Server extends AbstractBusTestServerBase {
+String tmpDir = TEMPDIR;
+Endpoint ep;
+public Server() {
+}
+public Server(String dir) {
+tmpDir = dir;
+}
+public Server(String[] args) {
+tmpDir = args[0];
+}
+protected void run()  {
+
+System.setProperty("temp.location", tmpDir);
+SpringBusFactory bf = new SpringBusFactory();
+Bus bus = 
bf.createBus("org/apache/cxf/systest/ws/policy/addr0705.xml");
+BusFactory.setDefaultBus(bus);
+setBus(bus);
+LoggingInInterceptor in = new LoggingInInterceptor();
+bus.getInInterceptors().add(in);
+bus.getInFaultInterceptors().add(in);
+LoggingOutInterceptor out = new LoggingOutInterceptor();
+bus.getOutInterceptors().add(out);
+

cxf git commit: adding a ws-addr policy test using wsam-2007/05 namespace

2015-12-28 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 7bb94f04b -> 52ff49dd2


adding a ws-addr policy test using wsam-2007/05 namespace


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

Branch: refs/heads/master
Commit: 52ff49dd200d0b77b67fafa1eeb7ada04b6203ca
Parents: 7bb94f0
Author: Akitoshi Yoshida 
Authored: Tue Dec 29 00:49:19 2015 +0900
Committer: Akitoshi Yoshida 
Committed: Tue Dec 29 00:49:32 2015 +0900

--
 .../ws/policy/AddressingPolicy0705Test.java | 161 +++
 .../cxf/systest/ws/policy/addr-external0705.xml |  37 +
 .../apache/cxf/systest/ws/policy/addr0705.xml   |  31 
 3 files changed, 229 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/52ff49dd/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
new file mode 100644
index 000..405c60c
--- /dev/null
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
@@ -0,0 +1,161 @@
+/**
+ * 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.systest.ws.policy;
+
+import java.io.Closeable;
+import java.util.logging.Logger;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.greeter_control.BasicGreeterService;
+import org.apache.cxf.greeter_control.Greeter;
+import org.apache.cxf.greeter_control.PingMeFault;
+import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.systest.ws.util.ConnectionHelper;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.TestUtil;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+/**
+ * Tests the use of the WS-Policy Framework to automatically engage 
WS-Addressing and
+ * WS-RM in response to Policies defined for the endpoint via an external 
policy attachment.
+ */
+// REVISIT this class is copied from AddressingPolicyTest to use the 
wsam-2007/05 namespace
+// consolidate this class with the original
+public class AddressingPolicy0705Test extends AbstractBusClientServerTestBase {
+public static final String PORT = allocatePort(Server.class);
+public static final String TEMPDIR = 
FileUtils.getDefaultTempDir().toURI().toString(); 
+
+private static final Logger LOG = 
LogUtils.getLogger(AddressingPolicy0705Test.class);
+
+public static class Server extends AbstractBusTestServerBase {
+String tmpDir = TEMPDIR;
+Endpoint ep;
+public Server() {
+}
+public Server(String dir) {
+tmpDir = dir;
+}
+public Server(String[] args) {
+tmpDir = args[0];
+}
+protected void run()  {
+
+System.setProperty("temp.location", tmpDir);
+SpringBusFactory bf = new SpringBusFactory();
+Bus bus = 
bf.createBus("org/apache/cxf/systest/ws/policy/addr0705.xml");
+BusFactory.setDefaultBus(bus);
+setBus(bus);
+LoggingInInterceptor in = new LoggingInInterceptor();
+bus.getInInterceptors().add(in);
+bus.getInFaultInterceptors().add(in);
+LoggingOutInterceptor out = new LoggingOutInterceptor();
+bus.getOutInterceptors().add(out);
+

cxf git commit: adding a ws-addr policy test using wsam-2007/05 namespace

2015-12-28 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d704868a7 -> 133b893ea


adding a ws-addr policy test using wsam-2007/05 namespace


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

Branch: refs/heads/3.0.x-fixes
Commit: 133b893ea524054bb8cd69f3f38929f637f11e5a
Parents: d704868
Author: Akitoshi Yoshida 
Authored: Tue Dec 29 00:49:19 2015 +0900
Committer: Akitoshi Yoshida 
Committed: Tue Dec 29 01:14:02 2015 +0900

--
 .../ws/policy/AddressingPolicy0705Test.java | 161 +++
 .../cxf/systest/ws/policy/addr-external0705.xml |  37 +
 .../apache/cxf/systest/ws/policy/addr0705.xml   |  31 
 3 files changed, 229 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/133b893e/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
new file mode 100644
index 000..405c60c
--- /dev/null
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java
@@ -0,0 +1,161 @@
+/**
+ * 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.systest.ws.policy;
+
+import java.io.Closeable;
+import java.util.logging.Logger;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.greeter_control.BasicGreeterService;
+import org.apache.cxf.greeter_control.Greeter;
+import org.apache.cxf.greeter_control.PingMeFault;
+import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.systest.ws.util.ConnectionHelper;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.TestUtil;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+/**
+ * Tests the use of the WS-Policy Framework to automatically engage 
WS-Addressing and
+ * WS-RM in response to Policies defined for the endpoint via an external 
policy attachment.
+ */
+// REVISIT this class is copied from AddressingPolicyTest to use the 
wsam-2007/05 namespace
+// consolidate this class with the original
+public class AddressingPolicy0705Test extends AbstractBusClientServerTestBase {
+public static final String PORT = allocatePort(Server.class);
+public static final String TEMPDIR = 
FileUtils.getDefaultTempDir().toURI().toString(); 
+
+private static final Logger LOG = 
LogUtils.getLogger(AddressingPolicy0705Test.class);
+
+public static class Server extends AbstractBusTestServerBase {
+String tmpDir = TEMPDIR;
+Endpoint ep;
+public Server() {
+}
+public Server(String dir) {
+tmpDir = dir;
+}
+public Server(String[] args) {
+tmpDir = args[0];
+}
+protected void run()  {
+
+System.setProperty("temp.location", tmpDir);
+SpringBusFactory bf = new SpringBusFactory();
+Bus bus = 
bf.createBus("org/apache/cxf/systest/ws/policy/addr0705.xml");
+BusFactory.setDefaultBus(bus);
+setBus(bus);
+LoggingInInterceptor in = new LoggingInInterceptor();
+bus.getInInterceptors().add(in);
+bus.getInFaultInterceptors().add(in);
+LoggingOutInterceptor out = new LoggingOutInterceptor();
+bus.getOutInterceptors().add(out);
+

cxf git commit: fix the schema access issue in systests/ws-specs's test

2015-12-16 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 6a89ad0de -> f803bff20


fix the schema access issue in  systests/ws-specs's test


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

Branch: refs/heads/3.1.x-fixes
Commit: f803bff20b8c0d4d5edf4cd89f128fc57ce7ebd3
Parents: 6a89ad0
Author: Akitoshi Yoshida 
Authored: Wed Dec 16 14:04:14 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Dec 16 14:08:46 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/f803bff2/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
index b07a5f9..d7eebef 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-http://www.springframework.org/schema/beans; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:http="http://cxf.apache.org/transports/http/configuration; 
xmlns:wsa="http://cxf.apache.org/ws/addressing; 
xmlns:jaxws="http://cxf.apache.org/jaxws; xsi:schemaLocation=" 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schema/transports/http.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd;>
+http://www.springframework.org/schema/beans; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:http="http://cxf.apache.org/transports/http/configuration; 
xmlns:wsa="http://cxf.apache.org/ws/addressing; 
xmlns:jaxws="http://cxf.apache.org/jaxws; xsi:schemaLocation=" 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schemas/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schema/transports/http.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd;>

cxf git commit: fix the schema access issue in systests/ws-specs's test

2015-12-16 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 10c48a2d2 -> 6f53b39b4


fix the schema access issue in  systests/ws-specs's test


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

Branch: refs/heads/3.0.x-fixes
Commit: 6f53b39b4f447eae9b6ce365c62672a736758918
Parents: 10c48a2
Author: Akitoshi Yoshida 
Authored: Wed Dec 16 14:04:14 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Dec 16 14:09:13 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6f53b39b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
index b07a5f9..d7eebef 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-http://www.springframework.org/schema/beans; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:http="http://cxf.apache.org/transports/http/configuration; 
xmlns:wsa="http://cxf.apache.org/ws/addressing; 
xmlns:jaxws="http://cxf.apache.org/jaxws; xsi:schemaLocation=" 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schema/transports/http.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd;>
+http://www.springframework.org/schema/beans; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:http="http://cxf.apache.org/transports/http/configuration; 
xmlns:wsa="http://cxf.apache.org/ws/addressing; 
xmlns:jaxws="http://cxf.apache.org/jaxws; xsi:schemaLocation=" 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schemas/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schema/transports/http.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd;>

cxf git commit: fix the schema access issue in systests/ws-specs's test

2015-12-16 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 01926cb73 -> ef57932bc


fix the schema access issue in  systests/ws-specs's test


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

Branch: refs/heads/master
Commit: ef57932bc767ac5e027f7773e593e2591dc9f535
Parents: 01926cb
Author: Akitoshi Yoshida 
Authored: Wed Dec 16 14:04:14 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Dec 16 14:05:40 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/ef57932b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
index b07a5f9..d7eebef 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/spring.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-http://www.springframework.org/schema/beans; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:http="http://cxf.apache.org/transports/http/configuration; 
xmlns:wsa="http://cxf.apache.org/ws/addressing; 
xmlns:jaxws="http://cxf.apache.org/jaxws; xsi:schemaLocation=" 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schema/transports/http.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd;>
+http://www.springframework.org/schema/beans; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:http="http://cxf.apache.org/transports/http/configuration; 
xmlns:wsa="http://cxf.apache.org/ws/addressing; 
xmlns:jaxws="http://cxf.apache.org/jaxws; xsi:schemaLocation=" 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schemas/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schema/transports/http.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd;>

cxf git commit: remove DOS CRs from spring.schemas

2015-12-11 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2d7e7939c -> 0dfe3a614


remove DOS CRs from spring.schemas


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

Branch: refs/heads/3.1.x-fixes
Commit: 0dfe3a614763d4cd64b00fd6441f2520a0ab8d53
Parents: 2d7e793
Author: Akitoshi Yoshida 
Authored: Fri Dec 11 12:32:58 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Fri Dec 11 13:19:25 2015 +0100

--
 core/src/main/resources/META-INF/spring.schemas | 64 ++--
 .../src/main/resources/META-INF/spring.schemas  | 42 ++---
 .../src/main/resources/META-INF/spring.schemas  | 42 ++---
 .../src/main/resources/META-INF/spring.schemas  | 44 +++---
 .../src/main/resources/META-INF/spring.schemas  | 42 ++---
 .../src/main/resources/META-INF/spring.handlers | 48 +++
 .../src/main/resources/META-INF/spring.schemas  | 58 +-
 .../src/main/resources/META-INF/spring.schemas  | 44 +++---
 8 files changed, 192 insertions(+), 192 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0dfe3a61/core/src/main/resources/META-INF/spring.schemas
--
diff --git a/core/src/main/resources/META-INF/spring.schemas 
b/core/src/main/resources/META-INF/spring.schemas
index 7eb3bc4..5a89b09 100644
--- a/core/src/main/resources/META-INF/spring.schemas
+++ b/core/src/main/resources/META-INF/spring.schemas
@@ -1,32 +1,32 @@
-#
-#
-#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.
-#
-#
-http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
-http\://cxf.apache.org/configuration/parameterized-types=schemas/configuration/parameterized-types.xsd
-
-http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
-http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
-
-http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
-http\://cxf.apache.org/schemas/configuration/parameterized-types.xsd=schemas/configuration/parameterized-types.xsd
-
-http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd
+#
+#
+#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.
+#
+#
+http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
+http\://cxf.apache.org/configuration/parameterized-types=schemas/configuration/parameterized-types.xsd
+
+http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
+http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
+
+http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
+http\://cxf.apache.org/schemas/configuration/parameterized-types.xsd=schemas/configuration/parameterized-types.xsd
+

cxf git commit: remove DOS CRs from spring.schemas

2015-12-11 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 8eaedc6fa -> 13bb88a8f


remove DOS CRs from spring.schemas


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

Branch: refs/heads/3.0.x-fixes
Commit: 13bb88a8f00e02eb66d8b410cbec50eecda4bbe3
Parents: 8eaedc6
Author: Akitoshi Yoshida 
Authored: Fri Dec 11 12:32:58 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Fri Dec 11 13:20:49 2015 +0100

--
 core/src/main/resources/META-INF/spring.schemas | 64 ++--
 .../src/main/resources/META-INF/spring.schemas  | 42 ++---
 .../src/main/resources/META-INF/spring.schemas  | 42 ++---
 .../src/main/resources/META-INF/spring.schemas  | 44 +++---
 .../src/main/resources/META-INF/spring.schemas  | 42 ++---
 .../src/main/resources/META-INF/spring.handlers | 48 +++
 .../src/main/resources/META-INF/spring.schemas  | 58 +-
 .../src/main/resources/META-INF/spring.schemas  | 44 +++---
 8 files changed, 192 insertions(+), 192 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/13bb88a8/core/src/main/resources/META-INF/spring.schemas
--
diff --git a/core/src/main/resources/META-INF/spring.schemas 
b/core/src/main/resources/META-INF/spring.schemas
index 7eb3bc4..5a89b09 100644
--- a/core/src/main/resources/META-INF/spring.schemas
+++ b/core/src/main/resources/META-INF/spring.schemas
@@ -1,32 +1,32 @@
-#
-#
-#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.
-#
-#
-http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
-http\://cxf.apache.org/configuration/parameterized-types=schemas/configuration/parameterized-types.xsd
-
-http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
-http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
-
-http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
-http\://cxf.apache.org/schemas/configuration/parameterized-types.xsd=schemas/configuration/parameterized-types.xsd
-
-http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd
+#
+#
+#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.
+#
+#
+http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
+http\://cxf.apache.org/configuration/parameterized-types=schemas/configuration/parameterized-types.xsd
+
+http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
+http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
+
+http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
+http\://cxf.apache.org/schemas/configuration/parameterized-types.xsd=schemas/configuration/parameterized-types.xsd
+

cxf git commit: remove DOS CRs from spring.schemas

2015-12-11 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master f346c8054 -> 70ae6e209


remove DOS CRs from spring.schemas


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

Branch: refs/heads/master
Commit: 70ae6e20936c2f424de95ce368e8b6209d426579
Parents: f346c80
Author: Akitoshi Yoshida 
Authored: Fri Dec 11 12:32:58 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Fri Dec 11 13:18:16 2015 +0100

--
 core/src/main/resources/META-INF/spring.schemas | 64 ++--
 .../src/main/resources/META-INF/spring.schemas  | 42 ++---
 .../src/main/resources/META-INF/spring.schemas  | 42 ++---
 .../src/main/resources/META-INF/spring.schemas  | 44 +++---
 .../src/main/resources/META-INF/spring.schemas  | 42 ++---
 .../src/main/resources/META-INF/spring.handlers | 48 +++
 .../src/main/resources/META-INF/spring.schemas  | 58 +-
 .../src/main/resources/META-INF/spring.schemas  | 44 +++---
 8 files changed, 192 insertions(+), 192 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/70ae6e20/core/src/main/resources/META-INF/spring.schemas
--
diff --git a/core/src/main/resources/META-INF/spring.schemas 
b/core/src/main/resources/META-INF/spring.schemas
index 7eb3bc4..5a89b09 100644
--- a/core/src/main/resources/META-INF/spring.schemas
+++ b/core/src/main/resources/META-INF/spring.schemas
@@ -1,32 +1,32 @@
-#
-#
-#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.
-#
-#
-http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
-http\://cxf.apache.org/configuration/parameterized-types=schemas/configuration/parameterized-types.xsd
-
-http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
-http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
-
-http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
-http\://cxf.apache.org/schemas/configuration/parameterized-types.xsd=schemas/configuration/parameterized-types.xsd
-
-http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd
+#
+#
+#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.
+#
+#
+http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
+http\://cxf.apache.org/configuration/parameterized-types=schemas/configuration/parameterized-types.xsd
+
+http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
+http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
+
+http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
+http\://cxf.apache.org/schemas/configuration/parameterized-types.xsd=schemas/configuration/parameterized-types.xsd
+

cxf git commit: update rt/ws/policy's spring.schemas to avoid remote access

2015-12-11 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 70ae6e209 -> 974280aae


update rt/ws/policy's spring.schemas to avoid remote access


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

Branch: refs/heads/master
Commit: 974280aaeecf67b540d2924809a4ed516f793677
Parents: 70ae6e2
Author: Akitoshi Yoshida 
Authored: Fri Dec 11 13:25:28 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Fri Dec 11 13:25:28 2015 +0100

--
 rt/ws/policy/src/main/resources/META-INF/spring.schemas | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/974280aa/rt/ws/policy/src/main/resources/META-INF/spring.schemas
--
diff --git a/rt/ws/policy/src/main/resources/META-INF/spring.schemas 
b/rt/ws/policy/src/main/resources/META-INF/spring.schemas
index f1d0787..b3f7597 100644
--- a/rt/ws/policy/src/main/resources/META-INF/spring.schemas
+++ b/rt/ws/policy/src/main/resources/META-INF/spring.schemas
@@ -26,4 +26,6 @@ 
http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.
 http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd
 http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd
 
http\://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd=schemas/xmldsig-core-schema.xsd
+http\://www.w3.org/2001/XMLSchema.dtd=schemas/XMLSchema.dtd
+http\://www.w3.org/2001/datatypes.dtd=schemas/datatypes.dtd

cxf git commit: change RM12PolicyWsdlTest's launch mode to in-process

2015-12-09 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 90e0b97b2 -> 1162380ad


change RM12PolicyWsdlTest's launch mode to in-process


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

Branch: refs/heads/master
Commit: 1162380ade44b86086db5413759b2b0d5496df96
Parents: 90e0b97
Author: Akitoshi Yoshida 
Authored: Wed Dec 9 21:00:38 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Dec 9 21:00:38 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/1162380a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
index f86b2f9..e1b9191 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
@@ -69,7 +69,7 @@ public class RM12PolicyWsdlTest extends RMPolicyWsdlTestBase {
 @BeforeClass
 public static void startServers() throws Exception {
 TestUtil.getNewPortNumber("decoupled");
-assertTrue("server did not launch correctly", 
launchServer(Server.class, false));
+assertTrue("server did not launch correctly", 
launchServer(Server.class, true));
 }
  
 @Test

cxf git commit: change RM12PolicyWsdlTest's launch mode to in-process

2015-12-09 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ab20d3539 -> c2e09554a


change RM12PolicyWsdlTest's launch mode to in-process


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

Branch: refs/heads/3.1.x-fixes
Commit: c2e09554a1bd7e4b1e252baabf433ed7ae29dd05
Parents: ab20d35
Author: Akitoshi Yoshida 
Authored: Wed Dec 9 21:00:38 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Dec 9 21:01:16 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/c2e09554/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
index f86b2f9..e1b9191 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
@@ -69,7 +69,7 @@ public class RM12PolicyWsdlTest extends RMPolicyWsdlTestBase {
 @BeforeClass
 public static void startServers() throws Exception {
 TestUtil.getNewPortNumber("decoupled");
-assertTrue("server did not launch correctly", 
launchServer(Server.class, false));
+assertTrue("server did not launch correctly", 
launchServer(Server.class, true));
 }
  
 @Test

cxf git commit: change RM12PolicyWsdlTest's launch mode to in-process

2015-12-09 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 23fa55ff6 -> 0678d530b


change RM12PolicyWsdlTest's launch mode to in-process


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

Branch: refs/heads/3.0.x-fixes
Commit: 0678d530bfa83b7722603dae131d187c3e2a43f0
Parents: 23fa55f
Author: Akitoshi Yoshida 
Authored: Wed Dec 9 21:00:38 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Dec 9 21:01:50 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/0678d530/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
--
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
index f86b2f9..e1b9191 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
@@ -69,7 +69,7 @@ public class RM12PolicyWsdlTest extends RMPolicyWsdlTestBase {
 @BeforeClass
 public static void startServers() throws Exception {
 TestUtil.getNewPortNumber("decoupled");
-assertTrue("server did not launch correctly", 
launchServer(Server.class, false));
+assertTrue("server did not launch correctly", 
launchServer(Server.class, true));
 }
  
 @Test

cxf git commit: add another wsdl generation test case for parameters with multiple headers

2015-12-03 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 3a6981463 -> 1f608e3e3


add another wsdl generation test case for parameters with multiple headers


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

Branch: refs/heads/master
Commit: 1f608e3e36270aef1873cb57d2b63abb5a3df951
Parents: 3a69814
Author: Akitoshi Yoshida 
Authored: Thu Dec 3 12:37:26 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Dec 3 14:13:30 2015 +0100

--
 .../cxf/tools/fortest/headers/SomeHeaders.java  | 39 
 .../internal/jaxws/JaxwsServiceBuilderTest.java | 15 +
 .../jaxws/expected/expected_someheaders.wsdl| 63 
 3 files changed, 117 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1f608e3e/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
--
diff --git 
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
new file mode 100644
index 000..acf879d
--- /dev/null
+++ 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
@@ -0,0 +1,39 @@
+/**
+ * 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.tools.fortest.headers;
+
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://apache.org/cxf/test;, name = 
"SomeHeaders")
+public interface SomeHeaders {
+
+// using four parameters where two being headers
+@WebMethod()
+@WebResult (name = "someHeadersResponse") 
+String hello(
+ @WebParam(name = "body1") String body1,
+ @WebParam(name = "body2") String body2,
+ @WebParam(header = true, name = "header1") String header1,
+ @WebParam(header = true, name = "header2") String header2);
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f608e3e/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
--
diff --git 
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
index f49aaae..a97c3ea 100644
--- 
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
+++ 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
@@ -259,6 +259,21 @@ public class JaxwsServiceBuilderTest extends 
ProcessorTestBase {
 assertWsdlEquals(new File(expectedFile), file);
 }
 
+@Test
+public void testMultipleHeaders() throws Exception {
+
builder.setServiceClass(org.apache.cxf.tools.fortest.headers.SomeHeaders.class);
+ServiceInfo service = builder.createService();
+
+generator.setServiceModel(service);
+File output = getOutputFile("someheaders.wsdl");
+assertNotNull(output);
+generator.generate(output);
+assertTrue(output.exists());
+
+URI expectedFile = 
this.getClass().getResource("expected/expected_someheaders.wsdl").toURI();
+assertWsdlEquals(new File(expectedFile), output);
+}
+
 // TODO: assertFileEquals
 @Test
 public void testCXF188() throws Exception {

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f608e3e/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_someheaders.wsdl

cxf git commit: add another wsdl generation test case for parameters with multiple headers

2015-12-03 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 4a0122981 -> 45e0f05ed


add another wsdl generation test case for parameters with multiple headers


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

Branch: refs/heads/3.1.x-fixes
Commit: 45e0f05ed5b29a33424d6f502db08dfc3898d0f0
Parents: 4a01229
Author: Akitoshi Yoshida 
Authored: Thu Dec 3 12:37:26 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Dec 3 14:15:28 2015 +0100

--
 .../cxf/tools/fortest/headers/SomeHeaders.java  | 39 
 .../internal/jaxws/JaxwsServiceBuilderTest.java | 15 +
 .../jaxws/expected/expected_someheaders.wsdl| 63 
 3 files changed, 117 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45e0f05e/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
--
diff --git 
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
new file mode 100644
index 000..acf879d
--- /dev/null
+++ 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
@@ -0,0 +1,39 @@
+/**
+ * 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.tools.fortest.headers;
+
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://apache.org/cxf/test;, name = 
"SomeHeaders")
+public interface SomeHeaders {
+
+// using four parameters where two being headers
+@WebMethod()
+@WebResult (name = "someHeadersResponse") 
+String hello(
+ @WebParam(name = "body1") String body1,
+ @WebParam(name = "body2") String body2,
+ @WebParam(header = true, name = "header1") String header1,
+ @WebParam(header = true, name = "header2") String header2);
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/45e0f05e/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
--
diff --git 
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
index f49aaae..a97c3ea 100644
--- 
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
+++ 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
@@ -259,6 +259,21 @@ public class JaxwsServiceBuilderTest extends 
ProcessorTestBase {
 assertWsdlEquals(new File(expectedFile), file);
 }
 
+@Test
+public void testMultipleHeaders() throws Exception {
+
builder.setServiceClass(org.apache.cxf.tools.fortest.headers.SomeHeaders.class);
+ServiceInfo service = builder.createService();
+
+generator.setServiceModel(service);
+File output = getOutputFile("someheaders.wsdl");
+assertNotNull(output);
+generator.generate(output);
+assertTrue(output.exists());
+
+URI expectedFile = 
this.getClass().getResource("expected/expected_someheaders.wsdl").toURI();
+assertWsdlEquals(new File(expectedFile), output);
+}
+
 // TODO: assertFileEquals
 @Test
 public void testCXF188() throws Exception {

http://git-wip-us.apache.org/repos/asf/cxf/blob/45e0f05e/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_someheaders.wsdl

cxf git commit: add another wsdl generation test case for parameters with multiple headers

2015-12-03 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 725e08411 -> ace4d3200


add another wsdl generation test case for parameters with multiple headers


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

Branch: refs/heads/3.0.x-fixes
Commit: ace4d320093ab7e537b456f02566133fc8ad5da0
Parents: 725e084
Author: Akitoshi Yoshida 
Authored: Thu Dec 3 12:37:26 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Dec 3 14:26:58 2015 +0100

--
 .../cxf/tools/fortest/headers/SomeHeaders.java  | 39 
 .../internal/jaxws/JaxwsServiceBuilderTest.java | 15 +
 .../jaxws/expected/expected_someheaders.wsdl| 63 
 3 files changed, 117 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ace4d320/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
--
diff --git 
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
new file mode 100644
index 000..acf879d
--- /dev/null
+++ 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/headers/SomeHeaders.java
@@ -0,0 +1,39 @@
+/**
+ * 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.tools.fortest.headers;
+
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://apache.org/cxf/test;, name = 
"SomeHeaders")
+public interface SomeHeaders {
+
+// using four parameters where two being headers
+@WebMethod()
+@WebResult (name = "someHeadersResponse") 
+String hello(
+ @WebParam(name = "body1") String body1,
+ @WebParam(name = "body2") String body2,
+ @WebParam(header = true, name = "header1") String header1,
+ @WebParam(header = true, name = "header2") String header2);
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ace4d320/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
--
diff --git 
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
index f49aaae..a97c3ea 100644
--- 
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
+++ 
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
@@ -259,6 +259,21 @@ public class JaxwsServiceBuilderTest extends 
ProcessorTestBase {
 assertWsdlEquals(new File(expectedFile), file);
 }
 
+@Test
+public void testMultipleHeaders() throws Exception {
+
builder.setServiceClass(org.apache.cxf.tools.fortest.headers.SomeHeaders.class);
+ServiceInfo service = builder.createService();
+
+generator.setServiceModel(service);
+File output = getOutputFile("someheaders.wsdl");
+assertNotNull(output);
+generator.generate(output);
+assertTrue(output.exists());
+
+URI expectedFile = 
this.getClass().getResource("expected/expected_someheaders.wsdl").toURI();
+assertWsdlEquals(new File(expectedFile), output);
+}
+
 // TODO: assertFileEquals
 @Test
 public void testCXF188() throws Exception {

http://git-wip-us.apache.org/repos/asf/cxf/blob/ace4d320/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_someheaders.wsdl

cxf git commit: [CXF-6699] DefaultAddress not set in HTTPConduit class

2015-12-02 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 6a088ce37 -> db9b8a631


[CXF-6699] DefaultAddress not set in HTTPConduit class


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

Branch: refs/heads/3.1.x-fixes
Commit: db9b8a631e9597d8fa0ff5d1f526a29d00f16b00
Parents: 6a088ce
Author: Akitoshi Yoshida 
Authored: Wed Dec 2 11:58:58 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Dec 2 12:00:22 2015 +0100

--
 .../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/db9b8a63/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index bb21424..9d4635b 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -682,7 +682,8 @@ public abstract class HTTPConduit
 return defaultAddress;
 }
 if (defaultAddress != null) {
-message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+result = defaultAddress.getString();
+message.put(Message.ENDPOINT_ADDRESS, result);
 }
 }

cxf git commit: [CXF-6699] DefaultAddress not set in HTTPConduit class

2015-12-02 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 2c95ec23b -> b3abf4a90


[CXF-6699] DefaultAddress not set in HTTPConduit class


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

Branch: refs/heads/master
Commit: b3abf4a902fa0475cdc1bc65cb7baeff10aa38cb
Parents: 2c95ec2
Author: Akitoshi Yoshida 
Authored: Wed Dec 2 11:58:58 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Dec 2 11:59:35 2015 +0100

--
 .../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b3abf4a9/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index bb21424..9d4635b 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -682,7 +682,8 @@ public abstract class HTTPConduit
 return defaultAddress;
 }
 if (defaultAddress != null) {
-message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+result = defaultAddress.getString();
+message.put(Message.ENDPOINT_ADDRESS, result);
 }
 }

cxf git commit: [CXF-6699] DefaultAddress not set in HTTPConduit class

2015-12-02 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 28b39f586 -> a109b9a7b


[CXF-6699] DefaultAddress not set in HTTPConduit class


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

Branch: refs/heads/3.0.x-fixes
Commit: a109b9a7b68105f4eeb6670b824709fa5ddd3a7f
Parents: 28b39f5
Author: Akitoshi Yoshida 
Authored: Wed Dec 2 11:58:58 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Dec 2 12:00:59 2015 +0100

--
 .../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a109b9a7/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 7f9b6fd..466f0e2 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -682,7 +682,8 @@ public abstract class HTTPConduit
 return defaultAddress;
 }
 if (defaultAddress != null) {
-message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+result = defaultAddress.getString();
+message.put(Message.ENDPOINT_ADDRESS, result);
 }
 }

cxf git commit: make systests/databinding not fetch remote web-app_2_3.dtd

2015-12-01 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master f2b0bc813 -> c6b6c5766


make systests/databinding not fetch remote web-app_2_3.dtd


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

Branch: refs/heads/master
Commit: c6b6c5766d11df20efc41b8e47f6b22d014203ce
Parents: f2b0bc8
Author: Akitoshi Yoshida 
Authored: Tue Dec 1 10:57:13 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Dec 1 10:57:31 2015 +0100

--
 systests/databinding/pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c6b6c576/systests/databinding/pom.xml
--
diff --git a/systests/databinding/pom.xml b/systests/databinding/pom.xml
index c6712e3..ce62f87 100644
--- a/systests/databinding/pom.xml
+++ b/systests/databinding/pom.xml
@@ -185,6 +185,10 @@
 ${project.version}
 
 
+${cxf.servlet-api.group}
+${cxf.servlet-api.artifact}
+
+
 org.eclipse.jetty
 jetty-server

cxf git commit: make systests/databinding not fetch remote web-app_2_3.dtd (for 3.2.x and 3.1.x only)

2015-12-01 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a400eaa95 -> 2f5f034b8


make systests/databinding not fetch remote web-app_2_3.dtd (for 3.2.x and 3.1.x 
only)


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

Branch: refs/heads/3.1.x-fixes
Commit: 2f5f034b8e8361aed103de5bd7fa7526847ac690
Parents: a400eaa
Author: Akitoshi Yoshida 
Authored: Tue Dec 1 10:57:13 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Tue Dec 1 10:59:03 2015 +0100

--
 systests/databinding/pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2f5f034b/systests/databinding/pom.xml
--
diff --git a/systests/databinding/pom.xml b/systests/databinding/pom.xml
index a3ac24b..3c5c009 100644
--- a/systests/databinding/pom.xml
+++ b/systests/databinding/pom.xml
@@ -185,6 +185,10 @@
 ${project.version}
 
 
+${cxf.servlet-api.group}
+${cxf.servlet-api.artifact}
+
+
 org.eclipse.jetty
 jetty-server

cxf git commit: Align xalan's osgi and non-osgi versions

2015-11-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 85001558a -> d17e1e485


Align xalan's osgi and non-osgi versions


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

Branch: refs/heads/3.0.x-fixes
Commit: d17e1e485fbd75124383b42ceb0c40a347311a0c
Parents: 8500155
Author: Akitoshi Yoshida 
Authored: Mon Nov 23 11:03:58 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Mon Nov 23 11:07:40 2015 +0100

--
 parent/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d17e1e48/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 801dfc9..5c696e3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -201,7 +201,8 @@
 1.2_5
 2.11.0_1
 5.2_4
-2.7.1_7
+2.7.2
+2.7.2_2
 2.0.8_6
 1.6.1_5
 1.1_4
@@ -986,7 +987,7 @@
 
 xalan
 xalan
-2.7.2
+${cxf.xalan.version}
 
 
 xml-apis

cxf git commit: make feature cxf-ws-security installable in karaf

2015-11-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 23e39b894 -> f4983a200


make feature cxf-ws-security installable in karaf


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

Branch: refs/heads/3.1.x-fixes
Commit: f4983a20099dfbf07592ec9b219f3f900159ae32
Parents: 23e39b8
Author: Akitoshi Yoshida 
Authored: Mon Nov 23 11:23:17 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Mon Nov 23 11:33:26 2015 +0100

--
 osgi/karaf/features/src/main/resources/features.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f4983a20/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index da1f799..dafdbea 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -118,6 +118,7 @@
 cxf-ws-policy
 wss4j
 cxf-ws-addr
+mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}
 mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}
 mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}
 mvn:org.apache.cxf/cxf-rt-security-saml/${project.version}
@@ -308,7 +309,7 @@
 
 cxf-core
 cxf-bindings-soap
-mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1
+mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}
 mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}
 mvn:org.apache.cxf/cxf-rt-transports-jms/${project.version}

cxf git commit: make feature cxf-ws-security installable in karaf

2015-11-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 432ed6477 -> 5d23a4f75


make feature cxf-ws-security installable in karaf


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

Branch: refs/heads/master
Commit: 5d23a4f759235cac430c4213ecb50ae7b3300b6b
Parents: 432ed64
Author: Akitoshi Yoshida 
Authored: Mon Nov 23 11:23:17 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Mon Nov 23 11:32:12 2015 +0100

--
 osgi/karaf/features/src/main/resources/features.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5d23a4f7/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index da1f799..dafdbea 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -118,6 +118,7 @@
 cxf-ws-policy
 wss4j
 cxf-ws-addr
+mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}
 mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}
 mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}
 mvn:org.apache.cxf/cxf-rt-security-saml/${project.version}
@@ -308,7 +309,7 @@
 
 cxf-core
 cxf-bindings-soap
-mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1
+mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}
 mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}
 mvn:org.apache.cxf/cxf-rt-transports-jms/${project.version}

cxf git commit: make feature cxf-ws-security installable in karaf

2015-11-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d17e1e485 -> 71d70edf5


make feature cxf-ws-security installable in karaf


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

Branch: refs/heads/3.0.x-fixes
Commit: 71d70edf51039326a6798776ed7e5ab1dbd0dc04
Parents: d17e1e4
Author: Akitoshi Yoshida 
Authored: Mon Nov 23 11:23:17 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Mon Nov 23 11:37:55 2015 +0100

--
 osgi/karaf/features/src/main/resources/features.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/71d70edf/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 47cec55..f57a4ea 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -113,6 +113,7 @@
 cxf-ws-policy
 wss4j
 cxf-ws-addr
+mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}
 mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}
 mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}
 mvn:org.apache.cxf/cxf-rt-security/${project.version}
@@ -281,8 +282,8 @@
 
 cxf-core
 cxf-bindings-soap
-
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1
-
mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}
+mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}
+mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}
 mvn:org.apache.cxf/cxf-rt-transports-jms/${project.version}

cxf git commit: Align xalan's osgi and non-osgi versions

2015-11-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 60f95e5c0 -> 23e39b894


Align xalan's osgi and non-osgi versions


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

Branch: refs/heads/3.1.x-fixes
Commit: 23e39b89406fa4dc1654c074dcb705f5bad062a6
Parents: 60f95e5
Author: Akitoshi Yoshida 
Authored: Mon Nov 23 11:03:58 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Mon Nov 23 11:06:07 2015 +0100

--
 parent/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/23e39b89/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6b3c040..210c0b0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -187,7 +187,8 @@
 1.2_5
 2.11.0_1
 5.2_4
-2.7.1_7
+2.7.2
+2.7.2_2
 2.0.8_6
 1.6.1_5
 1.1_4
@@ -998,7 +999,7 @@
 
 xalan
 xalan
-2.7.2
+${cxf.xalan.version}
 
 
 xml-apis

cxf git commit: Align xalan's osgi and non-osgi versions

2015-11-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 3e625ec68 -> 432ed6477


Align xalan's osgi and non-osgi versions


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

Branch: refs/heads/master
Commit: 432ed64778823caf650e98e6a349b53a6c8956ff
Parents: 3e625ec
Author: Akitoshi Yoshida 
Authored: Mon Nov 23 11:03:58 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Mon Nov 23 11:04:38 2015 +0100

--
 parent/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/432ed647/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9a67180..ebecbd9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -187,7 +187,8 @@
 1.2_5
 2.11.0_1
 5.2_4
-2.7.1_7
+2.7.2
+2.7.2_2
 2.0.8_6
 1.6.1_5
 1.1_4
@@ -999,7 +1000,7 @@
 
 xalan
 xalan
-2.7.2
+${cxf.xalan.version}
 
 
 xml-apis

cxf git commit: Upgrade httpcomponents.client to 4.3.6

2015-11-11 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c1334bcbb -> 734c0caa1


Upgrade httpcomponents.client to 4.3.6


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

Branch: refs/heads/3.0.x-fixes
Commit: 734c0caa1748b7153993f5776eb3edfe32e72a90
Parents: c1334bc
Author: Akitoshi Yoshida 
Authored: Wed Nov 11 10:15:31 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Nov 11 10:15:31 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/734c0caa/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 373b1d3..74c467b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -92,7 +92,7 @@
 1.9.4
 
4.0.2
 
[4.0,4.1)
-
4.3.5
+
4.3.6
 
4.3.3
 
[4.3,4.4.0)
 2.4.6

cxf git commit: [CXF-6667] Closing a source sequence in WS-RM may lead to inconsistent sequence status

2015-11-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master b97a0fed6 -> 3aede31ec


[CXF-6667] Closing a source sequence in WS-RM may lead to inconsistent sequence 
status


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

Branch: refs/heads/master
Commit: 3aede31ec2755468b6310591b4e3c467fb2b9ed2
Parents: b97a0fe
Author: Akitoshi Yoshida 
Authored: Wed Nov 4 15:32:57 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Nov 5 11:55:08 2015 +0100

--
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  |   6 +
 .../java/org/apache/cxf/ws/rm/RMEndpoint.java   |   1 -
 .../apache/cxf/systest/ws/rm/SequenceTest.java  | 125 +++
 3 files changed, 131 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3aede31e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index 38e5f7c..298ddcd 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -199,6 +199,12 @@ public class RMCaptureOutInterceptor extends 
AbstractRMInterceptor  {
 getManager().initializeInterceptorChain(msg);
 //doneCaptureMessage(msg);
 captureMessage(msg);
+} else if (isLastMessage) {
+// got either the rm11 CS or the rm10 empty LM
+RMStore store = getManager().getStore();
+if (null != store) {
+store.persistOutgoing(rmpsOut.getSourceSequence(), null);
+}
 }
 }
 private void captureMessage(Message message) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/3aede31e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
--
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
index 3146bac..e393124 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
@@ -816,7 +816,6 @@ public class RMEndpoint {
 // REVISIT: this may be non-standard
 // getProxy().ackRequested(seq);
 } else {
-
 getProxy().lastMessage(seq);
 }
 } catch (RMException ex) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/3aede31e/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
--
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
index f4124cf..346a0f6 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
@@ -23,9 +23,14 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
@@ -77,10 +82,15 @@ import org.apache.cxf.testutil.recorders.OutMessageRecorder;
 import org.apache.cxf.transport.http.HTTPConduit;
 import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
+import org.apache.cxf.ws.rm.DestinationSequence;
 import org.apache.cxf.ws.rm.RM10Constants;
 import org.apache.cxf.ws.rm.RMContextUtils;
 import org.apache.cxf.ws.rm.RMManager;
 import org.apache.cxf.ws.rm.RMProperties;
+import org.apache.cxf.ws.rm.SourceSequence;
+import org.apache.cxf.ws.rm.persistence.RMMessage;
+import org.apache.cxf.ws.rm.persistence.RMStore;
+import org.apache.cxf.ws.rm.v200702.Identifier;
 
 import org.junit.After;
 import org.junit.BeforeClass;
@@ -1392,6 +1402,11 @@ public class SequenceTest extends 
AbstractBusClientServerTestBase {
 public void testTerminateOnShutdown() throws Exception {
 init("org/apache/cxf/systest/ws/rm/terminate-on-shutdown.xml",

cxf git commit: [CXF-6667] Closing a source sequence in WS-RM may lead to inconsistent sequence status

2015-11-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes de2acc903 -> 0aec1458f


[CXF-6667] Closing a source sequence in WS-RM may lead to inconsistent sequence 
status


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

Branch: refs/heads/3.0.x-fixes
Commit: 0aec1458f4c69adc47c8613d9f41bef23655710c
Parents: de2acc9
Author: Akitoshi Yoshida 
Authored: Wed Nov 4 15:32:57 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Nov 5 13:51:33 2015 +0100

--
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  |   6 +
 .../java/org/apache/cxf/ws/rm/RMEndpoint.java   |   1 -
 .../apache/cxf/systest/ws/rm/SequenceTest.java  | 125 +++
 3 files changed, 131 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0aec1458/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
--
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index b52a6e8..8f1df9e 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -199,6 +199,12 @@ public class RMCaptureOutInterceptor extends 
AbstractRMInterceptor  {
 getManager().initializeInterceptorChain(msg);
 //doneCaptureMessage(msg);
 captureMessage(msg);
+} else if (isLastMessage) {
+// got either the rm11 CS or the rm10 empty LM
+RMStore store = getManager().getStore();
+if (null != store) {
+store.persistOutgoing(rmpsOut.getSourceSequence(), null);
+}
 }
 }
 private void captureMessage(Message message) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/0aec1458/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
--
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
index 3146bac..e393124 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
@@ -816,7 +816,6 @@ public class RMEndpoint {
 // REVISIT: this may be non-standard
 // getProxy().ackRequested(seq);
 } else {
-
 getProxy().lastMessage(seq);
 }
 } catch (RMException ex) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/0aec1458/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
--
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
index 1b3b9c3..49414f8 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
@@ -23,9 +23,14 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
@@ -77,10 +82,15 @@ import org.apache.cxf.testutil.recorders.OutMessageRecorder;
 import org.apache.cxf.transport.http.HTTPConduit;
 import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
+import org.apache.cxf.ws.rm.DestinationSequence;
 import org.apache.cxf.ws.rm.RM10Constants;
 import org.apache.cxf.ws.rm.RMContextUtils;
 import org.apache.cxf.ws.rm.RMManager;
 import org.apache.cxf.ws.rm.RMProperties;
+import org.apache.cxf.ws.rm.SourceSequence;
+import org.apache.cxf.ws.rm.persistence.RMMessage;
+import org.apache.cxf.ws.rm.persistence.RMStore;
+import org.apache.cxf.ws.rm.v200702.Identifier;
 
 import org.junit.After;
 import org.junit.BeforeClass;
@@ -1392,6 +1402,11 @@ public class SequenceTest extends 
AbstractBusClientServerTestBase {
 public void testTerminateOnShutdown() throws Exception {

cxf git commit: [CXF-6665] ClassCastException in SoapActionInInterceptor (regression in 2.7.x)

2015-11-05 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 86b169b16 -> 39e65abf8


[CXF-6665] ClassCastException in SoapActionInInterceptor (regression in 2.7.x)


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

Branch: refs/heads/2.7.x-fixes
Commit: 39e65abf8fe2b181a9262c5953c389e9bb7ca706
Parents: 86b169b
Author: Akitoshi Yoshida 
Authored: Thu Nov 5 18:35:02 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Thu Nov 5 18:35:02 2015 +0100

--
 .../binding/soap/interceptor/SoapActionInInterceptor.java   | 9 +
 .../soap/interceptor/SoapActionInInterceptorTest.java   | 5 ++---
 2 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/39e65abf/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
index f079681..2fba894 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
@@ -83,10 +83,11 @@ public class SoapActionInInterceptor extends 
AbstractSoapInterceptor {
 if (start == -1 && ct.indexOf("multipart/related") == 0 && 
ct.indexOf("start-info") == -1) {
 // the action property may not be found at the package's 
content-type for non-mtom multipart message
 // but skip searching if the start-info property is set
-List cts = CastUtils.cast((List)(((Map)
-
message.get("javax.mail.internet.InternetHeaders")).get(Message.CONTENT_TYPE)));
-if (cts != null && cts.size() > 0) {
-ct = cts.get(0);
+// use cxf-2.7.x specific code
+String[] cts = ((javax.mail.internet.InternetHeaders)
+
message.get("javax.mail.internet.InternetHeaders")).getHeader(Message.CONTENT_TYPE);
+if (cts != null && cts.length > 0) {
+ct = cts[0];
 start = ct.indexOf("action=");
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/39e65abf/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
--
diff --git 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index 286b28b..e39284a 100644
--- 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -173,12 +173,11 @@ public class SoapActionInInterceptorTest extends Assert {
 private SoapMessage setUpMessage(String contentType, SoapVersion version, 
String prop) {
 SoapMessage message = control.createMock(SoapMessage.class);
 Map headers = new TreeMap(String.CASE_INSENSITIVE_ORDER);
-Map partHeaders = new TreeMap(String.CASE_INSENSITIVE_ORDER);
+javax.mail.internet.InternetHeaders partHeaders = new 
javax.mail.internet.InternetHeaders();
 if (version instanceof Soap11 && prop != null) {
 headers.put("SOAPAction", Collections.singletonList(prop));
 } else if (version instanceof Soap12 && prop != null) {
-partHeaders.put(Message.CONTENT_TYPE, 
-Collections.singletonList("application/soap+xml; 
action=\"" + prop + "\""));
+partHeaders.setHeader(Message.CONTENT_TYPE, "application/soap+xml; 
action=\"" + prop + "\"");
 }
 EasyMock.expect(message.getVersion()).andReturn(version).anyTimes();
 
EasyMock.expect(message.get(Message.CONTENT_TYPE)).andReturn(contentType).anyTimes();

cxf git commit: fix checkstyle errors

2015-10-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 1616f1910 -> 42e6fde99


fix checkstyle errors


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

Branch: refs/heads/master
Commit: 42e6fde997a3b7e7408414e79e2003ec067910f3
Parents: 1616f19
Author: Akitoshi Yoshida 
Authored: Fri Oct 23 11:15:07 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Oct 23 11:15:07 2015 +0200

--
 .../cxf/transport/http_jetty/JettyHTTPServerEngine.java   | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/42e6fde9/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
--
diff --git 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index e4da5f4..0b864f5 100644
--- 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -594,14 +594,11 @@ public class JettyHTTPServerEngine implements 
ServerEngine {
 
 int major = 8;
 int minor = 0;
-try
-{
+try {
 String[] version = Server.getVersion().split("\\.");
 major = Integer.parseInt(version[0]);
 minor = Integer.parseInt(version[1]);
-}
-catch (Exception e)
-{
+} catch (Exception e) {
 // unparsable version
 }

cxf git commit: align the start-level values in features.xml

2015-10-23 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 42e6fde99 -> ff4fd0c01


align the start-level values in features.xml


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

Branch: refs/heads/master
Commit: ff4fd0c01aaf8ef1cbdb8707eb50a54d762d640b
Parents: 42e6fde
Author: Akitoshi Yoshida 
Authored: Fri Oct 23 11:16:04 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Oct 23 11:16:04 2015 +0200

--
 osgi/karaf/features/src/main/resources/features.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ff4fd0c0/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 19845bf..80c339c 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -40,7 +40,7 @@
 
 
 cxf-specs
-mvn:commons-codec/commons-codec/${cxf.commons-codec.version}
+mvn:commons-codec/commons-codec/${cxf.commons-codec.version}
 mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}
 mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}
 mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}
@@ -76,7 +76,7 @@
 
 cxf-specs
 mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}
 mvn:org.apache.cxf/cxf-core/${project.version}
 mvn:org.apache.cxf/cxf-rt-management/${project.version}
@@ -339,7 +339,7 @@
 
 
 cxf-jaxb
-mvn:commons-lang/commons-lang/${cxf.commons-lang.version}
+mvn:commons-lang/commons-lang/${cxf.commons-lang.version}
 mvn:org.apache.cxf.xjc-utils/cxf-xjc-runtime/${cxf.xjc-utils.version}
 
 
@@ -351,7 +351,7 @@
 cxf-jaxrs
 cxf-jaxws
 cxf-javascript
-
mvn:commons-lang/commons-lang/${cxf.commons-lang.version}
+mvn:commons-lang/commons-lang/${cxf.commons-lang.version}
 
mvn:org.apache.velocity/velocity/${cxf.velocity.version}
 
mvn:commons-collections/commons-collections/${cxf.commons-collections.version}
 mvn:org.apache.cxf/cxf-tools-common/${project.version}
@@ -450,7 +450,7 @@
 cxf-core
 cxf-jaxrs
 mvn:commons-lang/commons-lang/${cxf.commons-lang.version}
-mvn:commons-codec/commons-codec/${cxf.commons-codec.version}
+mvn:commons-codec/commons-codec/${cxf.commons-codec.version}
 mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}
 mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}
 mvn:org.apache.james/apache-mime4j-core/${cxf.james.mim4j.version}

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1171 matches

Mail list logo