svn commit: r795483 - in /camel/trunk/components/camel-web: pom.xml src/main/java/org/apache/camel/web/model/EndpointLink.java

[davsclaus]

Author: davsclaus
Date: Sun Jul 19 06:47:10 2009
New Revision: 795483

URL: http://svn.apache.org/viewvc?rev=795483&view=rev
Log:
CAMEL-1839: fixed camel-web and rendering endpoints urls. Upgraded to Jersey 
1.1.1-ea.

Modified:
    camel/trunk/components/camel-web/pom.xml
    
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java

Modified: camel/trunk/components/camel-web/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=795483&r1=795482&r2=795483&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Sun Jul 19 06:47:10 2009
@@ -31,7 +31,7 @@
 
   <properties>
     <camel.osgi.export.pkg>org.apache.camel.web.*</camel.osgi.export.pkg>
-    <jersey-version>1.0.3</jersey-version>
+    <jersey-version>1.1.1-ea</jersey-version>
     <jetty-port>8080</jetty-port>
     <webdriver-version>685</webdriver-version>
   </properties>

Modified: 
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java?rev=795483&r1=795482&r2=795483&view=diff
==============================================================================
--- 
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java
 (original)
+++ 
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java
 Sun Jul 19 06:47:10 2009
@@ -61,7 +61,7 @@
         this.uri = endpoint.getEndpointUri();
         this.href = createHref(key);
     }
-    
+
     public String getHref() {
         return href;
     }
@@ -79,8 +79,10 @@
     }
 
     protected String createHref(String uri) {
-        // TODO how to encode as a href?
-        return "/endpoints/" + uri;
+        // must not include :// in endpoint link
+        // TODO: might need to use 
org.apache.camel.util.UnsafeUriCharactersEncoder to safely encode URI for the 
web
+        String href = uri.contains("://") ? uri.replace("://", ":") : uri;
+        return "/endpoints/" + href;
     }
 
 }