Author: dkulp
Date: Fri Jul 8 20:23:22 2011
New Revision: 1144487
URL: http://svn.apache.org/viewvc?rev=1144487&view=rev
Log:
Merged revisions 1100711 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1100711 | davsclaus | 2011-05-08 05:49:12 -0400 (Sun, 08 May 2011) | 1 line
CAMEL-3950: Fixed camel-web not being able to start routes which was
configured as no auto startup.
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/applicationContext.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:23:22 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098032,1098628,1098630,1099228,1099417,1100975,1102162,1102177,1102181,1104076,1124497,1127744,1127988,1128315,1128970,1131411,1132961,1134252,1134260,1134404,1134501,1134626,1134681,1134714-1134911,1135223,1135364,1136065,1136290,1138285,1139163,1139749,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098032,1098628,1098630,1099228,1099417,1100711,1100975,1102162,1102177,1102181,1104076,1124497,1127744,1127988,1128315,1128970,1131411,1132961,1134252,1134260,1134404,1134501,1134626,1134681,1134714-1134911,1135223,1135364,1136065,1136290,1138285,1139163,1139749,1140096-1140102,1141783,1143925,1144248,1144324
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.7.x/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java?rev=1144487&r1=1144486&r2=1144487&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java
Fri Jul 8 20:23:22 2011
@@ -69,10 +69,10 @@ public class RouteStatusResource {
public Response setStatus(String status) throws Exception {
if (status != null) {
if (status.equalsIgnoreCase("start")) {
- getCamelContext().startRoute(getRoute());
+ getCamelContext().startRoute(getRoute().getId());
return Response.ok().build();
} else if (status.equalsIgnoreCase("stop")) {
- getCamelContext().stopRoute(getRoute());
+ getCamelContext().stopRoute(getRoute().getId());
return Response.ok().build();
}
}
Modified:
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/applicationContext.xml?rev=1144487&r1=1144486&r2=1144487&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/applicationContext.xml
Fri Jul 8 20:23:22 2011
@@ -17,21 +17,16 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:context="http://www.springframework.org/schema/context";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring";>
- <route>
- <description>This is an example route which you can start, stop and
modify</description>
-
- <from uri="seda:foo"/>
- <to uri="mock:results"/>
- </route>
- </camelContext>
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
+ <route>
+ <description>This is an example route which you can start, stop
and modify</description>
+ <from uri="seda:foo"/>
+ <to uri="mock:results"/>
+ </route>
+ </camelContext>
</beans>
