You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/12/02 20:54:50 UTC
[1/2] servicemix git commit: SM-2749: Upgrade to Apache Camel 2.15.5
(closes #36)
Repository: servicemix
Updated Branches:
refs/heads/servicemix-6.0.x 698186d8c -> 52889860e
SM-2749: Upgrade to Apache Camel 2.15.5 (closes #36)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/ee94bc40
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/ee94bc40
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/ee94bc40
Branch: refs/heads/servicemix-6.0.x
Commit: ee94bc40bc8fb630f2acc1ff3042d1a8cc8f5358
Parents: 698186d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Dec 1 10:32:51 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Dec 2 20:43:21 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ee94bc40/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 881d5c4..2ab8b00 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -45,7 +45,7 @@
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.transaction.version>1.1.1</aries.transaction.version>
<aries.util.version>1.1.1</aries.util.version>
- <camel.version>2.15.4</camel.version>
+ <camel.version>2.15.5</camel.version>
<commons-codec.bundle.version>1.10</commons-codec.bundle.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
[2/2] servicemix git commit: SM-2749: Upgrade to Apache Camel 2.15.5
Posted by ks...@apache.org.
SM-2749: Upgrade to Apache Camel 2.15.5
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/52889860
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/52889860
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/52889860
Branch: refs/heads/servicemix-6.0.x
Commit: 52889860e09fb1d6d2239da2f0628a2f3009187b
Parents: ee94bc4
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed Dec 2 20:44:25 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Dec 2 20:53:13 2015 +0100
----------------------------------------------------------------------
.../main/resources/OSGI-INF/blueprint/camel-server.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/52889860/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml b/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml
index 263096e..dbf780b 100644
--- a/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml
+++ b/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml
@@ -43,13 +43,19 @@ http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/cor
<!-- CAMEL -->
<camelContext id="camel"
xmlns="http://camel.apache.org/schema/blueprint">
+
+ <dataFormats>
+ <xstream id="xstream-default"
+ permissions="org.drools.core.command.**,org.apache.servicemix.examples.drools.**"/>
+ </dataFormats>
+
<!-- Route catch REST request and forward request to Kie Policy Bean-->
<route>
<from uri="cxfrs:bean:restKieServer" />
<policy ref="kiePolicy">
- <unmarshal ref="xstream" />
+ <unmarshal ref="xstream-default" />
<to uri="kie:simpleRuleKSession" />
- <marshal ref="xstream" />
+ <marshal ref="xstream-default" />
</policy>
</route>