Author: hadrian
Date: Mon May 30 23:17:38 2011
New Revision: 1129431
URL: http://svn.apache.org/viewvc?rev=1129431&view=rev
Log:
CAMEL-3991. Port fixes to the 2.7.x branch
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 23:17:38 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1102162,1104076
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1102162,1104076,1124497
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 23:17:38 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1102162,1104076
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1102162,1104076,1124497
Modified:
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml?rev=1129431&r1=1129430&r2=1129431&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
(original)
+++
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
Mon May 30 23:17:38 2011
@@ -61,7 +61,7 @@
- if (requestUri.startsWith("/index"))
%span Home
- else
- %a{:href => {uri("/index")}, title => "Home"} Home
+ %a{:href => {uri("/index")}, :title => "Home"} Home
|
%a{:href => {uri("/endpoints")}, :title => "View current
endpoints or create new ones"} Endpoints
|
