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 2009/06/08 10:33:07 UTC
svn commit: r782557 - in /camel/trunk/components:
camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Author: ningjiang
Date: Mon Jun 8 08:33:07 2009
New Revision: 782557
URL: http://svn.apache.org/viewvc?rev=782557&view=rev
Log:
CAMEL-1681 clean up the CamelNamespaceHandlers
Modified:
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java?rev=782557&r1=782556&r2=782557&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java Mon Jun 8 08:33:07 2009
@@ -28,18 +28,7 @@
super.init();
registerParser("camelContext", new CamelContextBeanDefinitionParser(CamelContextFactoryBean.class));
}
-
- protected JAXBContext createJaxbContext() throws JAXBException {
- StringBuilder packages = new StringBuilder();
- for (Class cl : getJaxbPackages()) {
- if (packages.length() > 0) {
- packages.append(":");
- }
- packages.append(cl.getName().substring(0, cl.getName().lastIndexOf('.')));
- }
- return JAXBContext.newInstance(packages.toString(), getClass().getClassLoader());
- }
-
+
protected Set<Class> getJaxbPackages() {
Set<Class> classes = new HashSet<Class>();
classes.add(org.apache.camel.osgi.CamelContextFactoryBean.class);
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=782557&r1=782556&r2=782557&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Mon Jun 8 08:33:07 2009
@@ -81,21 +81,7 @@
addBeanDefinitionParser("template", CamelProducerTemplateFactoryBean.class);
addBeanDefinitionParser("consumerTemplate", CamelConsumerTemplateFactoryBean.class);
addBeanDefinitionParser("export", CamelServiceExporter.class);
-
- // data types
- // TODO: why do we have this for data types, and only these 4 out of the 10+ data types we have in total?
- addBeanDefinitionParser("artixDS", ArtixDSDataFormat.class);
- addBeanDefinitionParser("jaxb", JaxbDataFormat.class);
- addBeanDefinitionParser("serialization", SerializationDataFormat.class);
- addBeanDefinitionParser("xmlBeans", XMLBeansDataFormat.class);
-
- // load balancers
- addBeanDefinitionParser("roundRobin", RoundRobinLoadBalancerDefinition.class);
- addBeanDefinitionParser("random", RandomLoadBalancerDefinition.class);
- addBeanDefinitionParser("sticky", StickyLoadBalancerDefinition.class);
- addBeanDefinitionParser("topic", TopicLoadBalancerDefinition.class);
- addBeanDefinitionParser("failover", FailoverLoadBalancerDefinition.class);
-
+
// jmx agent
addBeanDefinitionParser("jmxAgent", CamelJMXAgentDefinition.class);
@@ -198,9 +184,11 @@
element.setAttribute("id", contextId);
}
- // now lets parse the routes
+ // now lets parse the routes with JAXB
Object value = parseUsingJaxb(element, parserContext);
+
if (value instanceof CamelContextFactoryBean) {
+ // set the property value with the JAXB parsed value
CamelContextFactoryBean factoryBean = (CamelContextFactoryBean)value;
builder.addPropertyValue("id", contextId);
builder.addPropertyValue("routes", factoryBean.getRoutes());
@@ -212,7 +200,6 @@
builder.addPropertyValue("onExceptions", factoryBean.getOnExceptions());
builder.addPropertyValue("builderRefs", factoryBean.getBuilderRefs());
builder.addPropertyValue("properties", factoryBean.getProperties());
-
if (factoryBean.getPackages().length > 0) {
builder.addPropertyValue("packages", factoryBean.getPackages());
}