svn commit: r934703 - in /camel/trunk/components: camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java

[da...@apache.org]

Author: davsclaus
Date: Fri Apr 16 07:24:56 2010
New Revision: 934703

URL: http://svn.apache.org/viewvc?rev=934703&view=rev
Log:
CAMEL-2645: camel-http uses convention over configuration to set auth scheme priority based on authMethod uses. eg if only using Basic then priority is limited to Basic as well.

Modified:
    camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
    camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java

Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=934703&r1=934702&r2=934703&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java Fri Apr 16 07:24:56 2010
@@ -17,7 +17,7 @@
 package org.apache.camel.component.http;
 
 import java.net.URI;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -198,7 +198,7 @@ public class HttpComponent extends Heade
         validateParameters(uri, parameters, "httpClient.");       
         
         // create the configurer to use for this endpoint (authMethods contains the used methods created by the configurer)
-        final Set<AuthMethod> authMethods = new HashSet<AuthMethod>();
+        final Set<AuthMethod> authMethods = new LinkedHashSet<AuthMethod>();
         HttpClientConfigurer configurer = createHttpClientConfigurer(parameters, authMethods);
         
         // restructure uri to be based on the parameters left as we dont want to include the Camel internal options

Modified: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java?rev=934703&r1=934702&r2=934703&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java Fri Apr 16 07:24:56 2010
@@ -17,9 +17,12 @@
 package org.apache.camel.component.servlet;
 
 import java.net.URI;
+import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.camel.Endpoint;
+import org.apache.camel.component.http.AuthMethod;
 import org.apache.camel.component.http.CamelServlet;
 import org.apache.camel.component.http.HttpBinding;
 import org.apache.camel.component.http.HttpClientConfigurer;
@@ -63,7 +66,8 @@ public class ServletComponent extends Ht
         IntrospectionSupport.setProperties(params, parameters, "httpClient.");
         
         // create the configurer to use for this endpoint
-        HttpClientConfigurer configurer = createHttpClientConfigurer(parameters);
+        final Set<AuthMethod> authMethods = new LinkedHashSet<AuthMethod>();
+        HttpClientConfigurer configurer = createHttpClientConfigurer(parameters, authMethods);
 
         // must extract well known parameters before we create the endpoint
         HttpBinding binding = resolveAndRemoveReferenceParameter(parameters, "httpBindingRef", HttpBinding.class);