Author: ningjiang Date: Tue Dec 6 06:23:34 2011 New Revision: 1210792 URL: http://svn.apache.org/viewvc?rev=1210792&view=rev Log: Merged revisions 1210779 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
................ r1210779 | ningjiang | 2011-12-06 12:47:28 +0800 (Tue, 06 Dec 2011) | 9 lines Merged revisions 1210771 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1210771 | ningjiang | 2011-12-06 11:47:48 +0800 (Tue, 06 Dec 2011) | 1 line CAMEL-4744 Improve log message when starting Camel with routes having autoStartup=false ........ ................ Modified: camel/branches/camel-2.7.x/ (props changed) camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 6 06:23:34 2011 @@ -1,2 +1,2 @@ -/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933 -/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930 +/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779 +/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771 Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1210792&r1=1210791&r2=1210792&view=diff ============================================================================== --- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original) +++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Tue Dec 6 06:23:34 2011 @@ -1446,7 +1446,7 @@ public class DefaultCamelContext extends // start routes if (doNotStartRoutesOnFirstStart) { - log.info("Cannot start routes as CamelContext has been configured with autoStartup=false"); + log.debug("Skip starting of routes as CamelContext has been configured with autoStartup=false"); } // invoke this logic to warmup the routes and if possible also start the routes @@ -1867,7 +1867,7 @@ public class DefaultCamelContext extends // if we are starting camel, then skip routes which are configured to not be auto started boolean autoStartup = routeService.getRouteDefinition().isAutoStartup(this); if (addingRoute && !autoStartup) { - log.info("Cannot start route " + routeService.getId() + " as its configured with autoStartup=false"); + log.info("Skipping starting of route " + routeService.getId() + " as its configured with autoStartup=false"); continue; }
