You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/02/05 12:48:28 UTC
svn commit: r1240704 - in /camel/trunk/components: camel-cometd/src/main/java/org/apache/camel/component/cometd/ camel-jetty/src/main/java/org/apache/camel/component/jetty/ camel-jetty/src/test/java/org/apache/camel/component/jetty/

Author: bvahdat
Date: Sun Feb  5 11:48:27 2012
New Revision: 1240704

URL: http://svn.apache.org/viewvc?rev=1240704&view=rev
Log:
Removed deprecated API usage of Jetty after upgrading it to the version 7.5.4.

Modified:
    camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
    camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
    camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.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=1240704&r1=1240703&r2=1240704&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 Sun Feb  5 11:48:27 2012
@@ -220,7 +220,7 @@ public class CometdComponent extends Def
             sslSocketConnector.getSslContextFactory().setKeyManagerPassword(sslPassword);
             sslSocketConnector.getSslContextFactory().setKeyStorePassword(sslKeyPassword);
             if (sslKeystore != null) {
-                sslSocketConnector.getSslContextFactory().setKeyStore(sslKeystore);
+                sslSocketConnector.getSslContextFactory().setKeyStorePath(sslKeystore);
             }
 
         }

Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=1240704&r1=1240703&r2=1240704&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java Sun Feb  5 11:48:27 2012
@@ -517,9 +517,9 @@ public class JettyHttpComponent extends 
     
             String keystoreProperty = System.getProperty(JETTY_SSL_KEYSTORE);
             if (keystoreProperty != null) {
-                answer.getSslContextFactory().setKeyStore(keystoreProperty);
+                answer.getSslContextFactory().setKeyStorePath(keystoreProperty);
             } else if (sslKeystore != null) {
-                answer.getSslContextFactory().setKeyStore(sslKeystore);
+                answer.getSslContextFactory().setKeyStorePath(sslKeystore);
             }
     
             String keystorePassword = System.getProperty(JETTY_SSL_KEYPASSWORD);

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java?rev=1240704&r1=1240703&r2=1240704&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java Sun Feb  5 11:48:27 2012
@@ -35,7 +35,7 @@ public class ExplicitHttpsRouteTest exte
         sslSocketConnector.getSslContextFactory().setKeyManagerPassword(pwd);
         sslSocketConnector.getSslContextFactory().setKeyStorePassword(pwd);
         URL keyStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks");
-        sslSocketConnector.getSslContextFactory().setKeyStore(keyStoreUrl.toURI().getPath());
+        sslSocketConnector.getSslContextFactory().setKeyStorePath(keyStoreUrl.toURI().getPath());
         sslSocketConnector.getSslContextFactory().setTrustStoreType("JKS");
         return sslSocketConnector;
     }