You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/30 04:25:51 UTC
[1/4] git commit: Fixed the unit test issue of upgrade to CXF 2.7.12
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 80b34607f -> 598d2b3c2
refs/heads/camel-2.13.x 84aa5c6ca -> e737849d8
refs/heads/camel-2.14.x 9c1001469 -> 3cac0a741
Fixed the unit test issue of upgrade to CXF 2.7.12
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3bf3aefa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3bf3aefa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3bf3aefa
Branch: refs/heads/camel-2.13.x
Commit: 3bf3aefa3cb21230b36cda933746635c88f51a23
Parents: 84aa5c6
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Jul 16 15:42:51 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Sep 29 22:14:20 2014 +0800
----------------------------------------------------------------------
.../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3bf3aefa/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
index f1a70a1..794e39e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.mtom;
import java.awt.image.BufferedImage;
import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -124,16 +125,17 @@ public class CxfMtomProducerPayloadModeTest extends AbstractJUnit4SpringContextT
Element ele = (Element)xu.getValue("//ns:DetailResponse/ns:photo/xop:Include", oute,
XPathConstants.NODE);
String photoId = ele.getAttribute("href").substring(4); // skip "cid:"
-
+
ele = (Element)xu.getValue("//ns:DetailResponse/ns:image/xop:Include", oute,
XPathConstants.NODE);
String imageId = ele.getAttribute("href").substring(4); // skip "cid:"
- DataHandler dr = exchange.getOut().getAttachment(photoId);
+
+ DataHandler dr = exchange.getOut().getAttachment(decodingReference(photoId));
Assert.assertEquals("application/octet-stream", dr.getContentType());
MtomTestHelper.assertEquals(MtomTestHelper.RESP_PHOTO_DATA, IOUtils.readBytesFromStream(dr.getInputStream()));
- dr = exchange.getOut().getAttachment(imageId);
+ dr = exchange.getOut().getAttachment(decodingReference(imageId));
Assert.assertEquals("image/jpeg", dr.getContentType());
BufferedImage image = ImageIO.read(dr.getInputStream());
@@ -144,6 +146,11 @@ public class CxfMtomProducerPayloadModeTest extends AbstractJUnit4SpringContextT
}
+ // CXF encoding the XOP reference since 3.0.1
+ private String decodingReference(String reference) throws UnsupportedEncodingException {
+ return java.net.URLDecoder.decode(reference, "UTF-8");
+ }
+
protected boolean isMtomEnabled() {
return true;
}
[3/4] git commit: CAMEL-7881 Fixed the camel-restlet feature install
issue
Posted by ni...@apache.org.
CAMEL-7881 Fixed the camel-restlet feature install issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e737849d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e737849d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e737849d
Branch: refs/heads/camel-2.13.x
Commit: e737849d8fd4919593507e03441cdb9d1ee54b35
Parents: 3bf3aef
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 30 10:23:19 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 30 10:24:33 2014 +0800
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e737849d/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index a140257..0d35a98 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -875,6 +875,9 @@
<feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.osgi/org.restlet/${restlet-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.osgi/org.restlet.ext.httpclient/${restlet-version}</bundle>
<bundle>mvn:org.apache.camel/camel-restlet/${project.version}</bundle>
</feature>
[4/4] git commit: CAMEL-7881 Fixed the camel-restlet feature install
issue
Posted by ni...@apache.org.
CAMEL-7881 Fixed the camel-restlet feature install issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/598d2b3c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/598d2b3c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/598d2b3c
Branch: refs/heads/camel-2.12.x
Commit: 598d2b3c2d56b1b5a406ddc658c43ad89b89d850
Parents: 80b3460
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 30 10:23:19 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 30 10:25:23 2014 +0800
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/598d2b3c/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index e97faa8..667f1fb 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -783,6 +783,9 @@
<feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.osgi/org.restlet/${restlet-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.osgi/org.restlet.ext.httpclient/${restlet-version}</bundle>
<bundle>mvn:org.apache.camel/camel-restlet/${project.version}</bundle>
</feature>
[2/4] git commit: CAMEL-7881 Fixed the camel-restlet feature install
issue
Posted by ni...@apache.org.
CAMEL-7881 Fixed the camel-restlet feature install issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3cac0a74
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3cac0a74
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3cac0a74
Branch: refs/heads/camel-2.14.x
Commit: 3cac0a741c7be530a082e13d90bca3740a6ed79c
Parents: 9c10014
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 30 10:23:19 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 30 10:24:22 2014 +0800
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3cac0a74/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 1550a6c..b06a95f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1025,6 +1025,9 @@
<feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.osgi/org.restlet/${restlet-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.osgi/org.restlet.ext.httpclient/${restlet-version}</bundle>
<bundle>mvn:org.apache.camel/camel-restlet/${project.version}</bundle>
</feature>