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 2010/06/01 06:11:21 UTC
svn commit: r949922 - in /camel/trunk/components:
camel-blueprint/src/main/java/org/apache/camel/blueprint/
camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/
camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/
camel-spring/ ...
Author: ningjiang
Date: Tue Jun 1 04:11:21 2010
New Revision: 949922
URL: http://svn.apache.org/viewvc?rev=949922&view=rev
Log:
Fixed the cs error of camel components
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java?rev=949922&r1=949921&r2=949922&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java Tue Jun 1 04:11:21 2010
@@ -74,8 +74,6 @@ import org.osgi.framework.FrameworkUtil;
@XmlAccessorType(XmlAccessType.FIELD)
public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<BlueprintCamelContext> {
- private static final Log LOG = LogFactory.getLog(CamelContextFactoryBean.class);
-
@XmlAttribute(name = "depends-on", required = false)
private String dependsOn;
@XmlAttribute(required = false)
@@ -194,7 +192,7 @@ public class CamelContextFactoryBean ext
}
@Override
- protected Object getBeanForType(Class clazz) {
+ protected <S> S getBeanForType(Class<S> clazz) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=949922&r1=949921&r2=949922&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java Tue Jun 1 04:11:21 2010
@@ -69,6 +69,7 @@ public class CamelNamespaceHandler imple
return getClass().getClassLoader().getResource("camel-blueprint.xsd");
}
+ @SuppressWarnings("unchecked")
public Set<Class> getManagedClasses() {
return new HashSet<Class>(Arrays.asList(
BlueprintCamelContext.class
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java?rev=949922&r1=949921&r2=949922&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java Tue Jun 1 04:11:21 2010
@@ -53,6 +53,7 @@ public class BundleDelegatingClassLoader
return resource;
}
+ @SuppressWarnings("unchecked")
protected Enumeration findResources(String name) throws IOException {
return bundle.getResources(name);
}
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=949922&r1=949921&r2=949922&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Tue Jun 1 04:11:21 2010
@@ -262,6 +262,10 @@
<file>${project.build.directory}/schema/camel-spring.xsd</file>
<type>xsd</type>
</artifact>
+ <artifact>
+ <file>${project.build.directory}/schema/camel-spring-v${camel.schema.version}</file>
+ <type>xsd</type>
+ </artifact>
</artifacts>
</configuration>
</execution>
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=949922&r1=949921&r2=949922&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Tue Jun 1 04:11:21 2010
@@ -153,6 +153,7 @@ public class CamelContextFactoryBean ext
return SpringCamelContext.class;
}
+ @SuppressWarnings("unchecked")
protected <S> S getBeanForType(Class<S> clazz) {
S bean = null;
String[] names = getApplicationContext().getBeanNamesForType(clazz, true, true);
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java?rev=949922&r1=949921&r2=949922&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java Tue Jun 1 04:11:21 2010
@@ -220,6 +220,7 @@ public class Main extends MainSupport {
}
}
+ @SuppressWarnings("unchecked")
protected Map<String, CamelContext> getCamelContextMap() {
Map<String, SpringCamelContext> map = applicationContext.getBeansOfType(SpringCamelContext.class);
Set<Map.Entry<String, SpringCamelContext>> entries = map.entrySet();
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java?rev=949922&r1=949921&r2=949922&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java Tue Jun 1 04:11:21 2010
@@ -43,6 +43,7 @@ public abstract class SpringRouteBuilder
* @param type the type of the bean
* @return the bean
*/
+ @SuppressWarnings("unchecked")
public <T> T lookup(String beanName, Class<T> type) {
ApplicationContext context = getApplicationContext();
return (T)context.getBean(beanName, type);
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java?rev=949922&r1=949921&r2=949922&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java Tue Jun 1 04:11:21 2010
@@ -55,6 +55,7 @@ public class ApplicationContextRegistry
}
}
+ @SuppressWarnings("unchecked")
public <T> Map<String, T> lookupByType(Class<T> type) {
return applicationContext.getBeansOfType(type);
}