You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2010/07/01 17:27:49 UTC
svn commit: r959694 - in /camel/trunk/components/camel-web/src/main:
java/org/apache/camel/web/resources/RoutesResource.java
webapp/org/apache/camel/web/resources/RouteResource/index.jsp
Author: jstrachan
Date: Thu Jul 1 15:27:48 2010
New Revision: 959694
URL: http://svn.apache.org/viewvc?rev=959694&view=rev
Log:
fix for CAMEL-2891 to use a URI template for languages which doesn't clash and preserves extensibility to other representations
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RouteResource/index.jsp
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java?rev=959694&r1=959693&r2=959694&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java Thu Jul 1 15:27:48 2010
@@ -111,7 +111,7 @@ public class RoutesResource extends Came
/**
* Looks up an individual route with specified language
*/
- @Path("{id}/{language}")
+ @Path("{id}/lang/{language}")
public RouteResource getRoute(@PathParam("id") String id, @PathParam("language") String language) {
RouteResource routeResource = getRoute(id);
if (routeResource != null) {
Modified: camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RouteResource/index.jsp
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RouteResource/index.jsp?rev=959694&r1=959693&r2=959694&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RouteResource/index.jsp (original)
+++ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RouteResource/index.jsp Thu Jul 1 15:27:48 2010
@@ -18,8 +18,8 @@
</div>
<ul>
-<li><a href='<c:url value="/routes/${it.route.id}/xml/edit"/>'>Edit Route in Xml</a>
-<li><a href='<c:url value="/routes/${it.route.id}/groovy/edit"/>'>Edit Route in Groovy</a>
+<li><a href='<c:url value="/routes/${it.route.id}/lang/xml/edit"/>'>Edit Route in Xml</a>
+<li><a href='<c:url value="/routes/${it.route.id}/lang/groovy/edit"/>'>Edit Route in Groovy</a>
<li>Edit Route in Ruby
<li>Edit Route in Scala
</ul>