Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java?rev=835186&r1=835185&r2=835186&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java (original) +++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java Thu Nov 12 01:21:11 2009 @@ -25,6 +25,7 @@ import org.apache.camel.component.ResourceBasedComponent; import org.apache.camel.converter.jaxp.XmlConverter; import org.apache.camel.impl.ProcessorEndpoint; +import org.apache.camel.util.CamelContextHelper; import org.springframework.core.io.Resource; /** @@ -44,19 +45,18 @@ this.xmlConverter = xmlConverter; } - @SuppressWarnings("unchecked") - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { Resource resource = resolveMandatoryResource(remaining); if (log.isDebugEnabled()) { log.debug(this + " using schema resource: " + resource); } - XsltBuilder xslt = newInstance(XsltBuilder.class); + XsltBuilder xslt = getCamelContext().getInjector().newInstance(XsltBuilder.class); // lets allow the converter to be configured XmlConverter converter = null; String converterName = getAndRemoveParameter(parameters, "converter", String.class); if (converterName != null) { - converter = mandatoryLookup(converterName, XmlConverter.class); + converter = CamelContextHelper.mandatoryLookup(getCamelContext(), converterName, XmlConverter.class); } if (converter == null) { converter = getXmlConverter(); @@ -69,9 +69,9 @@ TransformerFactory factory = null; if (transformerFactoryClassName != null) { // provide the class loader of this component to work in OSGi environments - Class factoryClass = getCamelContext().getClassResolver().resolveClass(transformerFactoryClassName, XsltComponent.class.getClassLoader()); + Class<?> factoryClass = getCamelContext().getClassResolver().resolveClass(transformerFactoryClassName, XsltComponent.class.getClassLoader()); if (factoryClass != null) { - factory = (TransformerFactory) newInstance(factoryClass); + factory = (TransformerFactory) getCamelContext().getInjector().newInstance(factoryClass); } else { log.warn("Cannot find the TransformerFactoryClass with the class name: " + transformerFactoryClassName); } @@ -79,7 +79,7 @@ String transformerFactoryName = getAndRemoveParameter(parameters, "transformerFactory", String.class); if (transformerFactoryName != null) { - factory = mandatoryLookup(transformerFactoryName, TransformerFactory.class); + factory = CamelContextHelper.mandatoryLookup(getCamelContext(), transformerFactoryName, TransformerFactory.class); } if (factory != null) { @@ -90,7 +90,7 @@ return new ProcessorEndpoint(uri, this, xslt); } - protected void configureXslt(XsltBuilder xslt, String uri, String remaining, Map parameters) throws Exception { + protected void configureXslt(XsltBuilder xslt, String uri, String remaining, Map<String, Object> parameters) throws Exception { setProperties(xslt, parameters); } }
Modified: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java?rev=835186&r1=835185&r2=835186&view=diff ============================================================================== --- camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java (original) +++ camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java Thu Nov 12 01:21:11 2009 @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.IntrospectionSupport; import org.springframework.jdbc.core.JdbcTemplate; @@ -39,10 +40,10 @@ } @Override - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { String dataSourceRef = getAndRemoveParameter(parameters, "dataSourceRef", String.class); if (dataSourceRef != null) { - dataSource = mandatoryLookup(dataSourceRef, DataSource.class); + dataSource = CamelContextHelper.mandatoryLookup(getCamelContext(), dataSourceRef, DataSource.class); } JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java?rev=835186&r1=835185&r2=835186&view=diff ============================================================================== --- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java (original) +++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java Thu Nov 12 01:21:11 2009 @@ -27,7 +27,7 @@ public class StreamComponent extends DefaultComponent { @Override - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { return new StreamEndpoint(uri, this); } } Modified: camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java?rev=835186&r1=835185&r2=835186&view=diff ============================================================================== --- camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java (original) +++ camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java Thu Nov 12 01:21:11 2009 @@ -26,8 +26,7 @@ */ public class StringTemplateComponent extends DefaultComponent { - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { return new StringTemplateEndpoint(uri, this, remaining, parameters); } - } \ No newline at end of file Modified: camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java?rev=835186&r1=835185&r2=835186&view=diff ============================================================================== --- camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java (original) +++ camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java Thu Nov 12 01:21:11 2009 @@ -37,7 +37,7 @@ this.velocityEngine = velocityEngine; } - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { String propertiesFile = getAndRemoveParameter(parameters, "propertiesFile", String.class); String encoding = getAndRemoveParameter(parameters, "encoding", String.class); boolean cache = getAndRemoveParameter(parameters, "contentCache", Boolean.class, Boolean.TRUE); Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java?rev=835186&r1=835185&r2=835186&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java (original) +++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java Thu Nov 12 01:21:11 2009 @@ -35,7 +35,7 @@ Map<String, XmppEndpoint> endpointCache = new HashMap<String, XmppEndpoint>(); @Override - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { if (endpointCache.containsKey(uri)) { LOG.debug("Using cached endpoint for URI " + uri);
