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 2008/10/18 10:16:41 UTC
svn commit: r705853 - in /activemq/camel/trunk/components/camel-spring/src:
main/java/org/apache/camel/spring/
main/resources/META-INF/services/org/apache/camel/component/
test/java/org/apache/camel/component/event/
test/resources/org/apache/camel/comp...
Author: davsclaus
Date: Sat Oct 18 01:16:41 2008
New Revision: 705853
URL: http://svn.apache.org/viewvc?rev=705853&view=rev
Log:
CAMEL-995: endpoint event is renamed to spring-event
Added:
activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/spring-event (props changed)
- copied unchanged from r705288, activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/event
Removed:
activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/event
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/event/camelContext.xml
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=705853&r1=705852&r2=705853&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Sat Oct 18 01:16:41 2008
@@ -279,7 +279,7 @@
public void onApplicationEvent(ApplicationEvent event) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Publishing event: " + event);
+ LOG.debug("Publishing spring-event: " + event);
}
if (event instanceof ContextRefreshedEvent) {
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=705853&r1=705852&r2=705853&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java Sat Oct 18 01:16:41 2008
@@ -106,7 +106,7 @@
public void onApplicationEvent(ApplicationEvent event) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Publishing event: " + event);
+ LOG.debug("Publishing spring-event: " + event);
}
if (event instanceof ContextRefreshedEvent) {
@@ -126,7 +126,7 @@
if (eventEndpoint != null) {
eventEndpoint.onApplicationEvent(event);
} else {
- LOG.warn("No eventEndpoint enabled for event: " + event);
+ LOG.warn("No spring-event endpoint enabled for: " + event);
}
}
}
@@ -142,7 +142,7 @@
this.applicationContext = applicationContext;
if (applicationContext instanceof ConfigurableApplicationContext) {
- addComponent("event", new EventComponent(applicationContext));
+ addComponent("spring-event", new EventComponent(applicationContext));
}
}
@@ -183,7 +183,7 @@
}
protected EventEndpoint createEventEndpoint() {
- EventEndpoint endpoint = getEndpoint("event:default", EventEndpoint.class);
+ EventEndpoint endpoint = getEndpoint("spring-event:default", EventEndpoint.class);
return endpoint;
}
Propchange: activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/spring-event
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/spring-event
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java?rev=705853&r1=705852&r2=705853&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java Sat Oct 18 01:16:41 2008
@@ -28,7 +28,7 @@
*/
public class EventRouteTest extends SpringTestSupport {
protected Object expectedBody = "Hello there!";
- protected String uri = "event:default";
+ protected String uri = "spring-event:default";
public void testSendingCamelExchangeToEndpointResultsInValidApplicationEventAfterTheRefreshEvent() throws Exception {
MockEndpoint result = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/event/camelContext.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/event/camelContext.xml?rev=705853&r1=705852&r2=705853&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/event/camelContext.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/event/camelContext.xml Sat Oct 18 01:16:41 2008
@@ -26,7 +26,7 @@
<package>org.apache.camel.component.event</package>
<route>
- <from uri="event:default"/>
+ <from uri="spring-event:default"/>
<to uri="mock:result"/>
</route>
</camelContext>