Skip to Content.
Sympa Menu

notify-dpml - r1747 - in trunk/main/planet/http: . impl/src/main/net/dpml/http impl/src/test/net/dpml/http

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1747 - in trunk/main/planet/http: . impl/src/main/net/dpml/http impl/src/test/net/dpml/http
  • Date: Tue, 12 Sep 2006 19:30:24 +0200

Author: mcconnell
Date: 2006-09-12 19:30:23 +0200 (Tue, 12 Sep 2006)
New Revision: 1747

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java

trunk/main/planet/http/impl/src/test/net/dpml/http/SslSocketConnectorTestCase.java
trunk/main/planet/http/module.xml
Log:
sync. with Jetty 6

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
2006-09-12 16:44:48 UTC (rev 1746)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
2006-09-12 17:30:23 UTC (rev 1747)
@@ -71,7 +71,7 @@
* @param suites the default suites argument
* @return the cipher suites
*/
- String[] getCipherSuites( String[] suites );
+ //String[] getCipherSuites( String[] suites );

/**
* Return the keystore password.
@@ -92,7 +92,7 @@
* @param algorithm implementation defined default value
* @return the supplied value unless overriden in the deployment
configuration
*/
- String getAlgorithm( String algorithm );
+ String getSecureRandomAlgorithm( String algorithm );

/**
* Return the keystore type.
@@ -237,8 +237,8 @@
setPassword( keystorePassword );
}

- String algorithm = context.getAlgorithm( ALGORITHM );
- setAlgorithm( algorithm );
+ String algorithm = context.getSecureRandomAlgorithm( ALGORITHM );
+ setSecureRandomAlgorithm( algorithm );

String protocol = context.getProtocol( PROTOCOL );
setProtocol( protocol );
@@ -265,11 +265,11 @@
boolean needClientAuth = context.getNeedClientAuth( false );
setNeedClientAuth( needClientAuth );

- String[] suites = context.getCipherSuites( (String[]) null );
- if( null != suites )
- {
- setCipherSuites( suites );
- }
+ //String[] suites = context.getCipherSuites( (String[]) null );
+ //if( null != suites )
+ //{
+ // setCipherSuites( suites );
+ //}
}

/**
@@ -290,7 +290,7 @@

private KeyManager[] getKeyManagers() throws Exception
{
- final String algorithm = getAlgorithm();
+ final String algorithm = getSecureRandomAlgorithm();
final KeyManagerFactory factory = KeyManagerFactory.getInstance(
algorithm );
final KeyStore store = loadKeyStore();
final char[] password = toCharArray( m_certificatePassword );

Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/SslSocketConnectorTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/SslSocketConnectorTestCase.java
2006-09-12 16:44:48 UTC (rev 1746)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/SslSocketConnectorTestCase.java
2006-09-12 17:30:23 UTC (rev 1747)
@@ -33,7 +33,7 @@
*/
public class SslSocketConnectorTestCase extends
AbstractConnectorContextTestCase
{
- private static final String[] CIPHER_SUITES = new String[0];
+ //private static final String[] CIPHER_SUITES = new String[0];
private static final String ALGORITHM = "QWERTY";
private static final String PROTOCOL = "XYZ";
private static final URI KEYSTORE_URI = createKeystoreURI();
@@ -53,8 +53,8 @@
{
Map map = createMap();

- map.put( "cipherSuites", CIPHER_SUITES );
- map.put( "algorithm", ALGORITHM );
+ //map.put( "cipherSuites", CIPHER_SUITES );
+ map.put( "secureRandomAlgorithm", ALGORITHM );
map.put( "protocol", PROTOCOL );
map.put( "keyStore", KEYSTORE_URI );
map.put( "keyStoreType", KEYSTORE_TYPE );
@@ -81,10 +81,10 @@
* Test min-thread assignment integrity.
* @throws Exception if an error occurs during test execution
*/
- public void testCipherSuites() throws Exception
- {
- assertEquals( "cipherSuites", CIPHER_SUITES,
m_connector.getCipherSuites() );
- }
+ //public void testCipherSuites() throws Exception
+ //{
+ // assertEquals( "cipherSuites", CIPHER_SUITES,
m_connector.getCipherSuites() );
+ //}

/**
* Test algorithm assignment integrity.
@@ -92,7 +92,7 @@
*/
public void testAlgorith() throws Exception
{
- assertEquals( "algorith", ALGORITHM, m_connector.getAlgorithm() );
+ assertEquals( "secureRandomAlgorithm", ALGORITHM,
m_connector.getSecureRandomAlgorithm() );
}

/**

Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-09-12 16:44:48 UTC (rev 1746)
+++ trunk/main/planet/http/module.xml 2006-09-12 17:30:23 UTC (rev 1747)
@@ -2,7 +2,7 @@
<module name="http" basedir="." xmlns="link:xsd:dpml/lang/dpml-module#1.0">

<properties>
- <property name="jetty.version" value="6.0.0-RC0"/>
+ <property name="jetty.version" value="6.0.0"/>
<property name="jasper.version" value="5.5.15"/>
<property name="sl4j.version" value="1.0.1"/>
<property name="project.major.version" value="0"/>




  • r1747 - in trunk/main/planet/http: . impl/src/main/net/dpml/http impl/src/test/net/dpml/http, mcconnell at BerliOS, 09/12/2006

Archive powered by MHonArc 2.6.24.

Top of Page