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 2013/04/12 17:46:53 UTC
svn commit: r1467320 - in /camel/trunk: components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/ tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/

Author: ningjiang
Date: Fri Apr 12 15:46:53 2013
New Revision: 1467320

URL: http://svn.apache.org/r1467320
Log:
CAMEL-6267 fixed the out of memory error of camel-cxfrs blueprint

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java?rev=1467320&r1=1467319&r2=1467320&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java Fri Apr 12 15:46:53 2013
@@ -69,8 +69,7 @@ public class RsClientDefinitionParser ex
                 Metadata list = parseListData(context, beanMetadata, elem);
                 beanMetadata.addProperty(name, list);
             } else if ("features".equals(name) || "providers".equals(name)
-                || "schemaLocations".equals(name) || "modelBeans".equals(name)
-                || "serviceBeans".equals(name)) {
+                || "schemaLocations".equals(name) || "modelBeans".equals(name)) {
                 Metadata list = parseListData(context, beanMetadata, elem);
                 beanMetadata.addProperty(name, list);
             } else if ("model".equals(name)) {
@@ -81,6 +80,7 @@ public class RsClientDefinitionParser ex
             } else {
                 setFirstChildAsProperty(elem, context, beanMetadata, name);
             }
+            elem = DOMUtils.getNextElement(elem);
         } 
  
         if (StringUtils.isEmpty(bus)) {

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java?rev=1467320&r1=1467319&r2=1467320&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java Fri Apr 12 15:46:53 2013
@@ -71,7 +71,8 @@ public class RsServerDefinitionParser ex
                 Metadata list = parseListData(context, beanMetadata, elem);
                 beanMetadata.addProperty(name, list);
             } else if ("features".equals(name) || "providers".equals(name)
-                || "schemaLocations".equals(name) || "modelBeans".equals(name)) {
+                || "schemaLocations".equals(name) || "modelBeans".equals(name)
+                || "serviceBeans".equals(name)) {
                 Metadata list = parseListData(context, beanMetadata, elem);
                 beanMetadata.addProperty(name, list);
             } else if ("model".equals(name)) {
@@ -82,6 +83,7 @@ public class RsServerDefinitionParser ex
             } else {
                 setFirstChildAsProperty(elem, context, beanMetadata, name);
             }
+            elem = DOMUtils.getNextElement(elem);
         } 
  
         if (StringUtils.isEmpty(bus)) {

Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml?rev=1467320&r1=1467319&r2=1467320&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml Fri Apr 12 15:46:53 2013
@@ -25,11 +25,19 @@
    
   <!-- Defined the server endpoint to create the cxf-rs consumer --> 
   <camelcxf:rsServer id="rsServer" address="http://localhost:9000/route"
-    serviceClass="org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService" />
+    serviceClass="org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService">
+     <camelcxf:features>
+         <bean class="org.apache.cxf.feature.LoggingFeature"/>
+     </camelcxf:features> 
+  </camelcxf:rsServer>
 
   <!-- Defined the client endpoint to create the cxf-rs consumer -->
   <camelcxf:rsClient id="rsClient" address="http://localhost:9002/rest"
-    serviceClass="org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService"/>
+    serviceClass="org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService">
+    <camelcxf:features>
+         <bean class="org.apache.cxf.feature.LoggingFeature"/>
+     </camelcxf:features> 
+  </camelcxf:rsClient>
   
   <!-- The camel route context -->
   <camel:camelContext>