You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/06/23 12:25:36 UTC
svn commit: r787624 - in
/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring:
Main.java SpringCamelContext.java handler/ScriptDefinitionParser.java
Author: davsclaus
Date: Tue Jun 23 10:25:36 2009
New Revision: 787624
URL: http://svn.apache.org/viewvc?rev=787624&view=rev
Log:
CAMEL-1747: camel-spring can now use spring 2.0.8 at runtime.
Modified:
camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ScriptDefinitionParser.java
Modified: camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java?rev=787624&r1=787623&r2=787624&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java (original)
+++ camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java Tue Jun 23 10:25:36 2009
@@ -184,7 +184,7 @@
if (applicationContext == null) {
applicationContext = createDefaultApplicationContext();
}
- LOG.debug("Starting Spring ApplicationContext: " + applicationContext.getId());
+ LOG.debug("Starting Spring ApplicationContext: " + applicationContext.getDisplayName());
applicationContext.start();
postProcessContext();
@@ -193,7 +193,7 @@
protected void doStop() throws Exception {
super.doStop();
if (applicationContext != null) {
- LOG.debug("Stopping Spring ApplicationContext: " + applicationContext.getId());
+ LOG.debug("Stopping Spring ApplicationContext: " + applicationContext.getDisplayName());
applicationContext.close();
}
}
Modified: camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=787624&r1=787623&r2=787624&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java (original)
+++ camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java Tue Jun 23 10:25:36 2009
@@ -219,9 +219,6 @@
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("SpringCamelContext(").append(getName()).append(")");
- if (applicationContext != null) {
- sb.append(" with spring id ").append(applicationContext.getId());
- }
return sb.toString();
}
Modified: camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ScriptDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ScriptDefinitionParser.java?rev=787624&r1=787623&r2=787624&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ScriptDefinitionParser.java (original)
+++ camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ScriptDefinitionParser.java Tue Jun 23 10:25:36 2009
@@ -42,7 +42,7 @@
if (engine == null) {
engine = element.getAttribute("language");
}
- builder.addConstructorArgValue(engine);
+ builder.addConstructorArg(engine);
super.doParse(element, parserContext, builder);
String scriptText = DomUtils.getTextValue(element).trim();
if (scriptText.length() > 0) {