svn commit: r1242675 - in /camel/branches/camel-2.9.x: ./ components/camel-cometd/src/main/java/org/apache/camel/component/cometd/ components/camel-jetty/src/main/java/org/apache/camel/component/jetty/ components/camel-jetty/src/test/java/org/apache/ca...

[hadrian]

Author: hadrian
Date: Fri Feb 10 05:05:27 2012
New Revision: 1242675

URL: http://svn.apache.org/viewvc?rev=1242675&view=rev
Log:
Merged revisions 1240704 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1240704 | bvahdat | 2012-02-05 06:48:27 -0500 (Sun, 05 Feb 2012) | 1 line
  
  Removed deprecated API usage of Jetty after upgrading it to the version 7.5.4.
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
    
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
    
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java?rev=1242675&r1=1242674&r2=1242675&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
 Fri Feb 10 05:05: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/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=1242675&r1=1242674&r2=1242675&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 Fri Feb 10 05:05:27 2012
@@ -520,9 +520,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/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java?rev=1242675&r1=1242674&r2=1242675&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
 Fri Feb 10 05:05: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;
     }