Author: gnodet
Date: Mon Aug 21 01:16:51 2006
New Revision: 433196
URL: http://svn.apache.org/viewvc?rev=433196&view=rev
Log:
Upgrade to jetty 6.0 rc1
Modified:
incubator/servicemix/trunk/pom.xml
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/CommonsHttpSSLSocketFactory.java
Modified: incubator/servicemix/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=433196&r1=433195&r2=433196&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Mon Aug 21 01:16:51 2006
@@ -207,7 +207,7 @@
<activeio-version>3.0-beta4</activeio-version>
<backport-util-concurrent-version>2.1</backport-util-concurrent-version>
<jencks-version>1.3-SNAPSHOT</jencks-version>
- <jetty-version>6.0.0rc0</jetty-version>
+ <jetty-version>6.0.0rc1</jetty-version>
<geronimo-version>1.1</geronimo-version>
<servicemix-version>3.0-incubating-SNAPSHOT</servicemix-version>
<wsdl4j-version>1.5.2</wsdl4j-version>
Modified:
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java?rev=433196&r1=433195&r2=433196&view=diff
==============================================================================
---
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java
(original)
+++
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java
Mon Aug 21 01:16:51 2006
@@ -55,7 +55,8 @@
private String keyStorePassword;
private String keyStoreType = "JKS"; // type of the key store
private String protocol = "TLS";
- private String algorithm = "SunX509"; // cert algorithm
+ private String keyManagerFactoryAlgorithm = "SunX509"; // cert algorithm
+ private String trustManagerFactoryAlgorithm = "SunX509"; // cert algorithm
private boolean wantClientAuth = false;
private boolean needClientAuth = false;
@@ -129,7 +130,8 @@
listener.setWantClientAuth(wantClientAuth);
listener.setNeedClientAuth(needClientAuth);
listener.setProtocol(protocol);
- listener.setAlgorithm(algorithm);
+ listener.setSslKeyManagerFactoryAlgorithm(keyManagerFactoryAlgorithm);
+
listener.setSslTrustManagerFactoryAlgorithm(trustManagerFactoryAlgorithm);
listener.setKeystoreType(keyStoreType);
server = new Server();
BoundedThreadPool btp = new BoundedThreadPool();
@@ -227,15 +229,29 @@
/**
* @return Returns the algorithm.
*/
- public String getAlgorithm() {
- return algorithm;
+ public String getKeyManagerFactoryAlgorithm() {
+ return keyManagerFactoryAlgorithm;
}
/**
* @param algorithm The algorithm to set.
*/
- public void setAlgorithm(String algorithm) {
- this.algorithm = algorithm;
+ public void setKeyManagerFactoryAlgorithm(String algorithm) {
+ this.keyManagerFactoryAlgorithm = algorithm;
+ }
+
+ /**
+ * @return Returns the algorithm.
+ */
+ public String getTrustManagerFactoryAlgorithm() {
+ return trustManagerFactoryAlgorithm;
+ }
+
+ /**
+ * @param algorithm The algorithm to set.
+ */
+ public void setTrustManagerFactoryAlgorithm(String algorithm) {
+ this.trustManagerFactoryAlgorithm = algorithm;
}
/**
Modified:
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java?rev=433196&r1=433195&r2=433196&view=diff
==============================================================================
---
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java
(original)
+++
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java
Mon Aug 21 01:16:51 2006
@@ -50,7 +50,8 @@
private String keyStorePassword;
private String keyStoreType = "JKS"; // type of the key store
private String protocol = "TLS";
- private String algorithm = "SunX509"; // cert algorithm
+ private String keyManagerFactoryAlgorithm = "SunX509"; // cert algorithm
+ private String trustManagerFactoryAlgorithm = "SunX509"; // cert algorithm
private boolean wantClientAuth = false;
private boolean needClientAuth = false;
@@ -124,7 +125,8 @@
listener.setWantClientAuth(wantClientAuth);
listener.setNeedClientAuth(needClientAuth);
listener.setProtocol(protocol);
- listener.setAlgorithm(algorithm);
+ listener.setSslKeyManagerFactoryAlgorithm(keyManagerFactoryAlgorithm);
+
listener.setSslTrustManagerFactoryAlgorithm(trustManagerFactoryAlgorithm);
listener.setKeystoreType(keyStoreType);
server = new Server();
BoundedThreadPool btp = new BoundedThreadPool();
@@ -219,15 +221,29 @@
/**
* @return Returns the algorithm.
*/
- public String getAlgorithm() {
- return algorithm;
+ public String getKeyManagerFactoryAlgorithm() {
+ return keyManagerFactoryAlgorithm;
}
/**
* @param algorithm The algorithm to set.
*/
- public void setAlgorithm(String algorithm) {
- this.algorithm = algorithm;
+ public void setKeyManagerFactoryAlgorithm(String algorithm) {
+ this.keyManagerFactoryAlgorithm = algorithm;
+ }
+
+ /**
+ * @return Returns the algorithm.
+ */
+ public String getTrustManagerFactoryAlgorithm() {
+ return trustManagerFactoryAlgorithm;
+ }
+
+ /**
+ * @param algorithm The algorithm to set.
+ */
+ public void setTrustManagerFactoryAlgorithm(String algorithm) {
+ this.trustManagerFactoryAlgorithm = algorithm;
}
/**
Modified:
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java?rev=433196&r1=433195&r2=433196&view=diff
==============================================================================
---
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java
(original)
+++
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java
Mon Aug 21 01:16:51 2006
@@ -35,7 +35,8 @@
private String trustStorePassword;
private String trustStoreType = "JKS";
private String protocol = "TLS";
- private String algorithm = "SunX509"; // cert algorithm
+ private String keyManagerFactoryAlgorithm = "SunX509"; // cert algorithm
+ private String trustManagerFactoryAlgorithm = "SunX509"; // cert algorithm
private String provider = null;
private boolean wantClientAuth = false;
private boolean needClientAuth = false;
@@ -79,14 +80,26 @@
/**
* @return Returns the algorithm.
*/
- public String getAlgorithm() {
- return algorithm;
+ public String getKeyManagerFactoryAlgorithm() {
+ return keyManagerFactoryAlgorithm;
}
/**
* @param algorithm The algorithm to set.
*/
- public void setAlgorithm(String algorithm) {
- this.algorithm = algorithm;
+ public void setKeyManagerFactoryAlgorithm(String algorithm) {
+ this.keyManagerFactoryAlgorithm = algorithm;
+ }
+ /**
+ * @return Returns the algorithm.
+ */
+ public String getTrustManagerFactoryAlgorithm() {
+ return trustManagerFactoryAlgorithm;
+ }
+ /**
+ * @param algorithm The algorithm to set.
+ */
+ public void setTrustManagerFactoryAlgorithm(String algorithm) {
+ this.trustManagerFactoryAlgorithm = algorithm;
}
/**
* @return Returns the keyPassword.
@@ -219,7 +232,8 @@
SslParameters s = (SslParameters) o;
return managed == s.managed &&
eq(keyAlias, s.keyAlias) &&
- eq(algorithm, s.algorithm) &&
+ eq(keyManagerFactoryAlgorithm, s.keyManagerFactoryAlgorithm) &&
+ eq(trustManagerFactoryAlgorithm,
s.trustManagerFactoryAlgorithm) &&
eq(keyPassword, s.keyPassword) &&
eq(keyStore, s.keyStore) &&
eq(keyStorePassword, s.keyStorePassword) &&
@@ -236,7 +250,8 @@
public int hashCode() {
return Boolean.valueOf(managed).hashCode() ^
hash(keyAlias) ^
- hash(algorithm) ^
+ hash(keyManagerFactoryAlgorithm) ^
+ hash(trustManagerFactoryAlgorithm) ^
hash(keyPassword) ^
hash(keyStore) ^
hash(keyStorePassword) ^
Modified:
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java?rev=433196&r1=433195&r2=433196&view=diff
==============================================================================
---
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
(original)
+++
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
Mon Aug 21 01:16:51 2006
@@ -245,7 +245,8 @@
throw new IllegalArgumentException("keyStore must be set");
}
ServiceMixSslSocketConnector sslConnector = new
ServiceMixSslSocketConnector();
- sslConnector.setAlgorithm(ssl.getAlgorithm());
+
sslConnector.setSslKeyManagerFactoryAlgorithm(ssl.getKeyManagerFactoryAlgorithm());
+
sslConnector.setSslTrustManagerFactoryAlgorithm(ssl.getTrustManagerFactoryAlgorithm());
sslConnector.setProtocol(ssl.getProtocol());
sslConnector.setConfidentialPort(url.getPort());
sslConnector.setKeystore(keyStore);
@@ -280,7 +281,8 @@
}
}
SslSocketConnector sslConnector = new SslSocketConnector();
- sslConnector.setAlgorithm(ssl.getAlgorithm());
+
sslConnector.setSslKeyManagerFactoryAlgorithm(ssl.getKeyManagerFactoryAlgorithm());
+
sslConnector.setSslTrustManagerFactoryAlgorithm(ssl.getTrustManagerFactoryAlgorithm());
sslConnector.setProtocol(ssl.getProtocol());
sslConnector.setConfidentialPort(url.getPort());
sslConnector.setPassword(ssl.getKeyStorePassword());
Modified:
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java?rev=433196&r1=433195&r2=433196&view=diff
==============================================================================
---
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
(original)
+++
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
Mon Aug 21 01:16:51 2006
@@ -75,7 +75,7 @@
return keystoreManager.createSSLServerFactory(
getProvider(),
getProtocol(),
- getAlgorithm(),
+ getSslKeyManagerFactoryAlgorithm(),
getKeystore(),
getKeyAlias(),
getTrustStore());
Modified:
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/CommonsHttpSSLSocketFactory.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/CommonsHttpSSLSocketFactory.java?rev=433196&r1=433195&r2=433196&view=diff
==============================================================================
---
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/CommonsHttpSSLSocketFactory.java
(original)
+++
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/CommonsHttpSSLSocketFactory.java
Mon Aug 21 01:16:51 2006
@@ -55,7 +55,7 @@
factory = keystoreManager.createSSLFactory(
ssl.getProvider(),
ssl.getProtocol(),
- ssl.getAlgorithm(),
+ ssl.getKeyManagerFactoryAlgorithm(),
ssl.getKeyStore(),
ssl.getKeyAlias(),
ssl.getTrustStore());
@@ -68,7 +68,7 @@
} else {
context = SSLContext.getInstance(ssl.getProtocol(),
ssl.getProvider());
}
- KeyManagerFactory keyManagerFactory =
KeyManagerFactory.getInstance(ssl.getAlgorithm());
+ KeyManagerFactory keyManagerFactory =
KeyManagerFactory.getInstance(ssl.getKeyManagerFactoryAlgorithm());
String keyStore = ssl.getKeyStore();
if (keyStore == null) {
keyStore = System.getProperty("javax.net.ssl.keyStore");
@@ -121,7 +121,7 @@
if (trustStore != null) {
KeyStore ts = KeyStore.getInstance(ssl.getTrustStoreType());
ts.load(Resource.newResource(trustStore).getInputStream(),
trustStorePassword.toCharArray());
- TrustManagerFactory trustManagerFactory =
TrustManagerFactory.getInstance(ssl.getAlgorithm());
+ TrustManagerFactory trustManagerFactory =
TrustManagerFactory.getInstance(ssl.getTrustManagerFactoryAlgorithm());
trustManagerFactory.init(ts);
context.init(keyManagerFactory.getKeyManagers(),
trustManagerFactory.getTrustManagers(), new java.security.SecureRandom());
} else {
