Author: ningjiang Date: Fri Apr 12 16:12:12 2013 New Revision: 1467332 URL: http://svn.apache.org/r1467332 Log: CAMEL-6267 fixed the out of memory error of camel-cxfrs blueprint Merged revisions 1467330 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1467330 | ningjiang | 2013-04-13 00:04:34 +0800 (Sat, 13 Apr 2013) | 10 lines Merged revisions 1467320 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1467320 | ningjiang | 2013-04-12 23:46:53 +0800 (Fri, 12 Apr 2013) | 1 line CAMEL-6267 fixed the out of memory error of camel-cxfrs blueprint ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1467320 Merged /camel/branches/camel-2.10.x:r1467330 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java?rev=1467332&r1=1467331&r2=1467332&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java Fri Apr 12 16:12:12 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/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java?rev=1467332&r1=1467331&r2=1467332&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java Fri Apr 12 16:12:12 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/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml?rev=1467332&r1=1467331&r2=1467332&view=diff ============================================================================== --- camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml (original) +++ camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouter.xml Fri Apr 12 16:12:12 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>
