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 2009/02/23 13:15:10 UTC

svn commit: r746975 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java

Author: jstrachan
Date: Mon Feb 23 12:15:07 2009
New Revision: 746975

URL: http://svn.apache.org/viewvc?rev=746975&view=rev
Log:
CAMEL-1355 - sorted the endpoints by default

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=746975&r1=746974&r2=746975&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Mon Feb 23 12:15:07 2009
@@ -23,6 +23,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.concurrent.Callable;
 
 import javax.naming.Context;
@@ -240,7 +241,7 @@
 
     public Map<String,Endpoint> getEndpointMap() {
         synchronized (endpoints) {
-            return new HashMap<String,Endpoint>(endpoints);
+            return new TreeMap<String,Endpoint>(endpoints);
         }
     }
 

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java?rev=746975&r1=746974&r2=746975&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java Mon Feb 23 12:15:07 2009
@@ -16,19 +16,18 @@
  */
 package org.apache.camel.web.model;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.util.ObjectHelper;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.util.ObjectHelper;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @version $Revision$
@@ -69,13 +68,6 @@
         for (Map.Entry<String, Endpoint> entry : entries) {
             addEndpoint(createEndpointLink(entry.getKey(), entry.getValue()));
         }
-/*
-        Collection<Endpoint> endpoints = camelContext.getSingletonEndpoints();
-        for (Endpoint endpoint : endpoints) {
-            addEndpoint(createEndpointLink(endpoint));
-        }
-*/
-
     }
 
     protected EndpointLink createEndpointLink(String key, Endpoint endpoint) {