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:51 UTC

[2/2] servicemix git commit: SM-2749: Upgrade to Apache Camel 2.15.5

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>