Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gorovoy2010-05-12 11:30:31 -0400
committerMichael Gorovoy2010-05-12 11:30:31 -0400
commit16ee953581cc062c0968c8edea6ab94e6075dd69 (patch)
tree40f3fc956babd75f63d93040b68e7847e1f04ff0
parentbe3c8682ed2298a00b1deb9100ca1b1e8be031fa (diff)
downloadorg.eclipse.jetty.project-16ee953581cc062c0968c8edea6ab94e6075dd69.tar.gz
org.eclipse.jetty.project-16ee953581cc062c0968c8edea6ab94e6075dd69.tar.xz
org.eclipse.jetty.project-16ee953581cc062c0968c8edea6ab94e6075dd69.zip
306226 HttpClient should allow changing the keystore and truststore type
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1767 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt1
-rw-r--r--jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java28
2 files changed, 27 insertions, 2 deletions
diff --git a/VERSION.txt b/VERSION.txt
index a3e0103283..e49b9f514d 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,6 +1,7 @@
jetty-7.1.1-SNAPSHOT
+ 302344 Make the list of available contexts if root context is not configured optional
+ 304803 Remove TypeUtil Integer and Long caches
+ + 306226 HttpClient should allow changing the keystore and truststore type
+ 308857 Update test suite to JUnit4 - Module jetty-jndi
+ 308856 Update test suite to JUnit4 - Module jetty-jmx
+ 308860 Update test suite to JUnit4 - Module jetty-rewrite
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
index a6b3c4ba54..5c81aa2a0e 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
@@ -800,12 +800,36 @@ public class HttpClient extends HttpBuffers implements Attributes
/* ------------------------------------------------------------ */
public void setKeyManagerPassword(String keyManagerPassword)
{
- this._keyManagerPassword = new Password(keyManagerPassword).toString();;
+ this._keyManagerPassword = new Password(keyManagerPassword).toString();
}
/* ------------------------------------------------------------ */
public void setTrustStorePassword(String trustStorePassword)
{
- this._trustStorePassword = new Password(trustStorePassword).toString();;
+ this._trustStorePassword = new Password(trustStorePassword).toString();
+ }
+
+ /* ------------------------------------------------------------ */
+ public String getKeyStoreType()
+ {
+ return this._keyStoreType;
+ }
+
+ /* ------------------------------------------------------------ */
+ public void setKeyStoreType(String keyStoreType)
+ {
+ this._keyStoreType = keyStoreType;
+ }
+
+ /* ------------------------------------------------------------ */
+ public String getTrustStoreType()
+ {
+ return this._trustStoreType;
+ }
+
+ /* ------------------------------------------------------------ */
+ public void setTrustStoreType(String trustStoreType)
+ {
+ this._trustStoreType = trustStoreType;
}
}

Back to the top