svn commit: r1202250 - /camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java

[dvaleri]

Author: dvaleri
Date: Tue Nov 15 15:41:23 2011
New Revision: 1202250

URL: http://svn.apache.org/viewvc?rev=1202250&view=rev
Log:
Reverted premature commit.

Modified:
    
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java

Modified: 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java?rev=1202250&r1=1202249&r2=1202250&view=diff
==============================================================================
--- 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
 (original)
+++ 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
 Tue Nov 15 15:41:23 2011
@@ -24,10 +24,8 @@ import javax.mail.Authenticator;
 import javax.mail.Message;
 import javax.mail.PasswordAuthentication;
 import javax.mail.Session;
-import javax.net.ssl.SSLContext;
 
 import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.util.jsse.SSLContextParameters;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 
@@ -65,7 +63,6 @@ public class MailConfiguration implement
     private boolean useInlineAttachments;
     private boolean ignoreUnsupportedCharset;
     private boolean disconnect;
-    private SSLContextParameters sslContextParameters;
 
     public MailConfiguration() {
     }
@@ -179,16 +176,8 @@ public class MailConfiguration implement
             // add more debug for the SSL communication as well
             properties.put("javax.net.debug", "all");
         }
-        
-        if (sslContextParameters != null && isSecureProtocol()) {
-            SSLContext sslContext;
-            try {
-                sslContext = sslContextParameters.createSSLContext();
-            } catch (Exception e) {
-                throw new RuntimeCamelException("Error initializing 
SSLContext.", e);
-            }
-            properties.put("mail." + protocol + ".socketFactory", 
sslContext.getSocketFactory());
-        } else if (dummyTrustManager && isSecureProtocol()) {
+
+        if (dummyTrustManager && isSecureProtocol()) {
             // set the custom SSL properties
             properties.put("mail." + protocol + ".socketFactory.class", 
"org.apache.camel.component.mail.security.DummySSLSocketFactory");
             properties.put("mail." + protocol + ".socketFactory.fallback", 
"false");
@@ -474,7 +463,7 @@ public class MailConfiguration implement
     public void setIgnoreUnsupportedCharset(boolean ignoreUnsupportedCharset) {
         this.ignoreUnsupportedCharset = ignoreUnsupportedCharset;
     }
-    
+
     public boolean isDisconnect() {
         return disconnect;
     }
@@ -482,12 +471,4 @@ public class MailConfiguration implement
     public void setDisconnect(boolean disconnect) {
         this.disconnect = disconnect;
     }
-
-    public SSLContextParameters getSslContextParameters() {
-        return sslContextParameters;
-    }
-
-    public void setSslContextParameters(SSLContextParameters 
sslContextParameters) {
-        this.sslContextParameters = sslContextParameters;
-    }
 }