You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2009/01/13 17:12:57 UTC
svn commit: r734166 - in /qpid/trunk/qpid/java: ./
systests/src/main/java/org/apache/qpid/test/utils/ test_resources/
test_resources/ssl/ test_resources/ssl/server_db/
Author: rajith
Date: Tue Jan 13 08:12:28 2009
New Revision: 734166
URL: http://svn.apache.org/viewvc?rev=734166&view=rev
Log:
This is related to QPID-1572.
The SSL test profile runs the java client against the C++ broker using SSL connections
Added:
qpid/trunk/qpid/java/cpp.ssl.testprofile
qpid/trunk/qpid/java/test_resources/
qpid/trunk/qpid/java/test_resources/ssl/
qpid/trunk/qpid/java/test_resources/ssl/certstore.jks (with props)
qpid/trunk/qpid/java/test_resources/ssl/keystore.jks (with props)
qpid/trunk/qpid/java/test_resources/ssl/pfile
qpid/trunk/qpid/java/test_resources/ssl/server_db/
qpid/trunk/qpid/java/test_resources/ssl/server_db/cert8.db (with props)
qpid/trunk/qpid/java/test_resources/ssl/server_db/key3.db (with props)
qpid/trunk/qpid/java/test_resources/ssl/server_db/secmod.db (with props)
qpid/trunk/qpid/java/test_resources/ssl/server_db/server.crt
qpid/trunk/qpid/java/test_resources/ssl/server_db/server.req
Modified:
qpid/trunk/qpid/java/module.xml
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/test-provider.properties
Added: qpid/trunk/qpid/java/cpp.ssl.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/cpp.ssl.testprofile?rev=734166&view=auto
==============================================================================
--- qpid/trunk/qpid/java/cpp.ssl.testprofile (added)
+++ qpid/trunk/qpid/java/cpp.ssl.testprofile Tue Jan 13 08:12:28 2009
@@ -0,0 +1,12 @@
+broker.version=0-10
+broker=${project.root}/../cpp/src/qpidd -p @PORT --load-module ${project.root}/../cpp/src/.libs/ssl.so --ssl-cert-password-file ${project.root}/test_resources/ssl/pfile --ssl-cert-db ${project.root}/test_resources/ssl/server_db/ --ssl-require-client-authentication --data-dir ${build.data}/@PORT -t --auth no
+test.excludesfile=${project.root}/ExcludeList ${project.root}/010ExcludeList
+test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#*
+profile.use_ssl=true
+broker.ready= Listening for SSL connections
+
+javax.net.ssl.keyStore=${project.root}/test_resources/ssl/keystore.jks
+javax.net.ssl.keyStorePassword=password
+javax.net.ssl.trustStore=${project.root}/test_resources/ssl/certstore.jks
+javax.net.ssl.trustStorePassword=password
+
Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=734166&r1=734165&r2=734166&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Tue Jan 13 08:12:28 2009
@@ -244,6 +244,9 @@
<syspropertyset>
<propertyref prefix="profile"/>
</syspropertyset>
+ <syspropertyset>
+ <propertyref prefix="javax.net.ssl"/>
+ </syspropertyset>
<sysproperty key="max_prefetch" value ="${max_prefetch}"/>
<sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
<sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/build"/>
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=734166&r1=734165&r2=734166&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Tue Jan 13 08:12:28 2009
@@ -518,7 +518,14 @@
_logger.info("get ConnectionFactory");
if (_connectionFactory == null)
{
- _connectionFactory = getConnectionFactory("default");
+ if (Boolean.getBoolean("profile.use_ssl"))
+ {
+ _connectionFactory = getConnectionFactory("ssl");
+ }
+ else
+ {
+ _connectionFactory = getConnectionFactory("default");
+ }
}
return _connectionFactory;
}
Modified: qpid/trunk/qpid/java/test-provider.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-provider.properties?rev=734166&r1=734165&r2=734166&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-provider.properties (original)
+++ qpid/trunk/qpid/java/test-provider.properties Tue Jan 13 08:12:28 2009
@@ -21,6 +21,7 @@
connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672'
connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1'
+connectionfactory.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5671?ssl='true''
connectionfactory.failover = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5673;tcp://localhost:5672'
connectionfactory.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'
Added: qpid/trunk/qpid/java/test_resources/ssl/certstore.jks
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test_resources/ssl/certstore.jks?rev=734166&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/trunk/qpid/java/test_resources/ssl/certstore.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: qpid/trunk/qpid/java/test_resources/ssl/keystore.jks
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test_resources/ssl/keystore.jks?rev=734166&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/trunk/qpid/java/test_resources/ssl/keystore.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: qpid/trunk/qpid/java/test_resources/ssl/pfile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test_resources/ssl/pfile?rev=734166&view=auto
==============================================================================
--- qpid/trunk/qpid/java/test_resources/ssl/pfile (added)
+++ qpid/trunk/qpid/java/test_resources/ssl/pfile Tue Jan 13 08:12:28 2009
@@ -0,0 +1 @@
+password
Added: qpid/trunk/qpid/java/test_resources/ssl/server_db/cert8.db
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test_resources/ssl/server_db/cert8.db?rev=734166&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/trunk/qpid/java/test_resources/ssl/server_db/cert8.db
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: qpid/trunk/qpid/java/test_resources/ssl/server_db/key3.db
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test_resources/ssl/server_db/key3.db?rev=734166&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/trunk/qpid/java/test_resources/ssl/server_db/key3.db
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: qpid/trunk/qpid/java/test_resources/ssl/server_db/secmod.db
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test_resources/ssl/server_db/secmod.db?rev=734166&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/trunk/qpid/java/test_resources/ssl/server_db/secmod.db
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: qpid/trunk/qpid/java/test_resources/ssl/server_db/server.crt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test_resources/ssl/server_db/server.crt?rev=734166&view=auto
==============================================================================
--- qpid/trunk/qpid/java/test_resources/ssl/server_db/server.crt (added)
+++ qpid/trunk/qpid/java/test_resources/ssl/server_db/server.crt Tue Jan 13 08:12:28 2009
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIICBjCCAW+gAwIBAgIFAItAexIwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMC
+Q0ExCzAJBgNVBAgTAk9OMQswCQYDVQQKEwJSSDEPMA0GA1UEAxMGUm9vdENBMB4X
+DTA4MTAyNDE4MjExMVoXDTA5MDEyNDE4MjExMVowRzELMAkGA1UEBhMCQ0ExCzAJ
+BgNVBAgTAk9OMQswCQYDVQQKEwJSSDEeMBwGA1UEAxMVbG9jYWxob3N0LmxvY2Fs
+ZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClh0DtKzSgDVjtJHdm
+GQPiMOWG2IIob3L9rK53GTz4VwN+y44WmBGGIp3dOXwwXPdKzCf7+d6DzaCnYozz
+izBtj68EDhynOWGfHXRYvY7K7rKBnpKucPAe3JmNlQqj/OPurHA0KCoF1BIkJ0mv
+7/9u5foPbssrzGHq7iBLB2P7rQIDAQABow0wCzAJBgNVHRMEAjAAMA0GCSqGSIb3
+DQEBBAUAA4GBADmVLjHDo0Uu4/jmfzDHrpPlNokWrHiIe4DtrBXoVQMeZXzlgclQ
+CZxEj6Gr9kxP3wiT81KBsTyXpMrQBQidqBDaQRbsx+qhL7ZZHwwBZbuKKyp9OGe9
+JjPTjqlECI0SdCAd0CUWwZonCPl2LCKIYbpUFCSvsYXWCsmIPzzMPMHd
+-----END CERTIFICATE-----
Added: qpid/trunk/qpid/java/test_resources/ssl/server_db/server.req
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test_resources/ssl/server_db/server.req?rev=734166&view=auto
==============================================================================
--- qpid/trunk/qpid/java/test_resources/ssl/server_db/server.req (added)
+++ qpid/trunk/qpid/java/test_resources/ssl/server_db/server.req Tue Jan 13 08:12:28 2009
@@ -0,0 +1,21 @@
+
+Certificate request generated by Netscape certutil
+Phone: (not specified)
+
+Common Name: localhost.localdomain
+Email: (not specified)
+Organization: RH
+State: ON
+Country: CA
+
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIIBhjCB8AIBADBHMQswCQYDVQQGEwJDQTELMAkGA1UECBMCT04xCzAJBgNVBAoT
+AlJIMR4wHAYDVQQDExVsb2NhbGhvc3QubG9jYWxkb21haW4wgZ8wDQYJKoZIhvcN
+AQEBBQADgY0AMIGJAoGBAKWHQO0rNKANWO0kd2YZA+Iw5YbYgihvcv2srncZPPhX
+A37LjhaYEYYind05fDBc90rMJ/v53oPNoKdijPOLMG2PrwQOHKc5YZ8ddFi9jsru
+soGekq5w8B7cmY2VCqP84+6scDQoKgXUEiQnSa/v/27l+g9uyyvMYeruIEsHY/ut
+AgMBAAGgADANBgkqhkiG9w0BAQQFAAOBgQACXXouY4nsGeMjj0Yp7rmUedBz98e5
+ShlpJWb9T4uH2qrzFyHwPvAGJEFsZE7gKmImwncSJid8ViQLgxzKJuTBqJIRH2kY
+qIVcK3lPxjvWj8he+JXxKORezhNbLHlBhLGGNZjnjv8kk15jFduevQeKsHMUN3KP
+EcJCs+NR7szy0w==
+-----END NEW CERTIFICATE REQUEST-----