svn commit: r1202248 - in /camel/trunk/components/camel-cometd/src: main/java/org/apache/camel/component/cometd/ test/java/org/apache/camel/component/cometd/

[dvaleri]

Author: dvaleri
Date: Tue Nov 15 15:38:48 2011
New Revision: 1202248

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

Removed:
    
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java
    
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java
Modified:
    
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java

Modified: 
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java?rev=1202248&r1=1202247&r2=1202248&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
 (original)
+++ 
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
 Tue Nov 15 15:38:48 2011
@@ -22,17 +22,12 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.net.ssl.SSLContext;
-
 import org.apache.camel.Endpoint;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.impl.DefaultComponent;
-import org.apache.camel.util.jsse.SSLContextParameters;
 import org.cometd.bayeux.server.BayeuxServer;
 import org.cometd.bayeux.server.SecurityPolicy;
 import org.cometd.server.BayeuxServerImpl;
 import org.cometd.server.CometdServlet;
-import org.eclipse.jetty.http.ssl.SslContextFactory;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -61,7 +56,6 @@ public class CometdComponent extends Def
     private SslSocketConnector sslSocketConnector;
     private SecurityPolicy securityPolicy;
     private List<BayeuxServer.Extension> extensions;
-    private SSLContextParameters sslContextParameters;
 
     class ConnectorRef {
         Connector connector;
@@ -203,28 +197,16 @@ public class CometdComponent extends Def
     }
 
     public synchronized SslSocketConnector getSslSocketConnector() {
-        if (sslContextParameters != null && sslSocketConnector == null) {
-            SslContextFactory sslContextFactory = new 
CometdComponentSslContextFactory();
-            try {
-                
sslContextFactory.setSslContext(sslContextParameters.createSSLContext());
-            } catch (Exception e) {
-               throw new RuntimeCamelException("Error initiating SSLContext.", 
e);
-            }
-            sslSocketConnector = new SslSocketConnector(sslContextFactory);
-        }
-        else {
-            if (sslSocketConnector == null) {
-                sslSocketConnector = new SslSocketConnector();
-                // with default null values, jetty ssl system properties
-                // and console will be read by jetty implementation
-                
sslSocketConnector.getSslContextFactory().setKeyManagerPassword(sslPassword);
-                
sslSocketConnector.getSslContextFactory().setKeyStorePassword(sslKeyPassword);
-                if (sslKeystore != null) {
-                    
sslSocketConnector.getSslContextFactory().setKeyStore(sslKeystore);
-                }
+        if (sslSocketConnector == null) {
+            sslSocketConnector = new SslSocketConnector();
+            // with default null values, jetty ssl system properties
+            // and console will be read by jetty implementation
+            
sslSocketConnector.getSslContextFactory().setKeyManagerPassword(sslPassword);
+            
sslSocketConnector.getSslContextFactory().setKeyStorePassword(sslKeyPassword);
+            if (sslKeystore != null) {
+                
sslSocketConnector.getSslContextFactory().setKeyStore(sslKeystore);
             }
         }
-        
         return sslSocketConnector;
     }
 
@@ -285,14 +267,6 @@ public class CometdComponent extends Def
         }
         extensions.add(extension);
     }
-    
-    public SSLContextParameters getSslContextParameters() {
-        return sslContextParameters;
-    }
-
-    public void setSslContextParameters(SSLContextParameters 
sslContextParameters) {
-        this.sslContextParameters = sslContextParameters;
-    }
 
     protected Server createServer() throws Exception {
         Server server = new Server();
@@ -318,14 +292,4 @@ public class CometdComponent extends Def
     protected void doStart() throws Exception {
         super.doStart();
     }
-    
-    /**
-     * Override the key/trust store check method as it does not account for a 
factory that has
-     * a pre-configured {@link SSLContext}.
-     */
-    private static final class CometdComponentSslContextFactory extends 
SslContextFactory {
-        @Override
-        public void checkKeyStore() {
-        }
-    }
 }