Changeset 1279


Ignore:
Timestamp:
12/08/11 11:00:35 (9 years ago)
Author:
philsmart
Message:
 
Location:
raptor-client/trunk
Files:
5 added
11 edited

Legend:

Unmodified
Added
Removed
  • raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl/ClientTLSParameters.java

    r1176 r1279  
    3636 
    3737import org.apache.cxf.configuration.jsse.TLSClientParameters; 
     38import org.slf4j.Logger; 
     39import org.slf4j.LoggerFactory; 
    3840 
    3941/** 
     
    4547 */ 
    4648public class ClientTLSParameters { 
     49     
     50    /** class logger */ 
     51    private final Logger log = LoggerFactory.getLogger(ClientTLSParameters.class); 
    4752 
    4853    /** The public certificates for trusted servers. */ 
     
    7883        final KeyStore keyStoreKeyManager = KeyStore.getInstance("JKS"); 
    7984        final File keyStoreFile = new File(keyStoreLocation); 
     85        log.debug("Tls Client Parameters uing keystore [{}], exists {}",keyStoreFile, keyStoreFile.exists()); 
    8086        keyStoreKeyManager.load(new FileInputStream(keyStoreFile), keyStorePassword.toCharArray()); 
    8187        final KeyManagerFactory keyFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); 
  • raptor-client/trunk/test-output/Default suite/Default test.html

    r1202 r1279  
    5656<h2 align='center'>Default test</h2><table border='1' align="center"> 
    5757<tr> 
    58 <td>Tests passed/Failed/Skipped:</td><td>2/0/0</td> 
     58<td>Tests passed/Failed/Skipped:</td><td>1/0/0</td> 
    5959</tr><tr> 
    60 <td>Started on:</td><td>Tue Nov 29 10:53:12 GMT 2011</td> 
     60<td>Started on:</td><td>Thu Dec 08 10:58:23 GMT 2011</td> 
    6161</tr> 
    62 <tr><td>Total time:</td><td>0 seconds (227 ms)</td> 
     62<tr><td>Total time:</td><td>0 seconds (21 ms)</td> 
    6363</tr><tr> 
    6464<td>Included groups:</td><td></td> 
     
    7676</tr> 
    7777<tr> 
    78 <td title='uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.cacheTest()'><b>cacheTest</b><br>Test class: uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest</td> 
     78<td title='uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest.getTrustStoreLocationTest()'><b>getTrustStoreLocationTest</b><br>Test class: uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest</td> 
    7979<td></td> 
    8080<td>0</td> 
    81 <td>uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest@233d28e3</td></tr> 
    82 <tr> 
    83 <td title='uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.getAttributesTest()'><b>getAttributesTest</b><br>Test class: uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest</td> 
    84 <td></td> 
    85 <td>0</td> 
    86 <td>uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest@233d28e3</td></tr> 
     81<td>uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest@162200d5</td></tr> 
    8782</table><p> 
    8883</body> 
  • raptor-client/trunk/test-output/Default suite/Default test.xml

    r1202 r1279  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <testsuite hostname="testkwshibb1.nerc.ac.uk" name="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest" tests="2" failures="0" timestamp="29 Nov 2011 10:53:12 GMT" time="0.227" errors="0"> 
    3   <testcase name="cacheTest" time="0.092" classname="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest"/> 
    4   <testcase name="getAttributesTest" time="0.0050" classname="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest"/> 
     2<!-- Generated by org.testng.reporters.JUnitXMLReporter --> 
     3<testsuite hostname="ipower.insrv.cf.ac.uk" name="Default test" tests="1" failures="0" timestamp="8 Dec 2011 10:58:23 GMT" time="0.021" errors="0"> 
     4  <testcase name="getTrustStoreLocationTest" time="0.0090" classname="uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest"/> 
    55</testsuite> 
  • raptor-client/trunk/test-output/Default suite/classes.html

    r1201 r1279  
    55<th>Groups</th> 
    66</tr><tr> 
    7 <td>uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest</td> 
     7<td>uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest</td> 
    88<td>&nbsp;</td><td>&nbsp;</td></tr> 
    99<tr> 
     
    1212<tr> 
    1313<td>&nbsp;</td> 
    14 <td>cacheTest</td> 
    15 <td>&nbsp;</td></tr> 
    16 <tr> 
    17 <td>&nbsp;</td> 
    18 <td>getAttributesTest</td> 
     14<td>getTrustStoreLocationTest</td> 
    1915<td>&nbsp;</td></tr> 
    2016<tr> 
    2117<td align='center' colspan='3'>@BeforeClass</td> 
    2218</tr> 
    23 <tr> 
    24 <td>&nbsp;</td> 
    25 <td>setup</td> 
    26 <td>&nbsp;</td></tr> 
    2719<tr> 
    2820<td align='center' colspan='3'>@BeforeMethod</td> 
  • raptor-client/trunk/test-output/Default suite/methods-alphabetical.html

    r1202 r1279  
    22<table border="1"> 
    33<tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr> 
    4 <tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>0</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.cacheTest()">cacheTest</td>  
    5   <td>main@1211753909</td>   <td></td> </tr> 
    6 <tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>94</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.getAttributesTest()">getAttributesTest</td>  
    7   <td>main@1211753909</td>   <td></td> </tr> 
    8 <tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>-119</td> <td>&nbsp;</td><td>&nbsp;</td><td title="&gt;&gt;uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.setup()">&gt;&gt;setup</td>  
    9 <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>  <td>main@1211753909</td>   <td></td> </tr> 
     4<tr bgcolor="e8a5c2">  <td>11/12/08 10:58:23</td>   <td>0</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="ClientTLSParametersTest.getTrustStoreLocationTest()[pri:0, instance:uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest@162200d5]">getTrustStoreLocationTest</td>  
     5  <td>main@1701136111</td>   <td></td> </tr> 
    106</table> 
  • raptor-client/trunk/test-output/Default suite/methods.html

    r1202 r1279  
    22<table border="1"> 
    33<tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr> 
    4 <tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>0</td> <td>&nbsp;</td><td>&nbsp;</td><td title="&gt;&gt;uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.setup()">&gt;&gt;setup</td>  
    5 <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>  <td>main@1211753909</td>   <td></td> </tr> 
    6 <tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>119</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.cacheTest()">cacheTest</td>  
    7   <td>main@1211753909</td>   <td></td> </tr> 
    8 <tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>213</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.getAttributesTest()">getAttributesTest</td>  
    9   <td>main@1211753909</td>   <td></td> </tr> 
     4<tr bgcolor="e8a5c2">  <td>11/12/08 10:58:23</td>   <td>0</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="ClientTLSParametersTest.getTrustStoreLocationTest()[pri:0, instance:uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest@162200d5]">getTrustStoreLocationTest</td>  
     5  <td>main@1701136111</td>   <td></td> </tr> 
    106</table> 
  • raptor-client/trunk/test-output/Default suite/testng.xml.html

    r1201 r1279  
    1 <html><head><title>testng.xml for Default suite</title></head><body><tt>&lt;?xml&nbsp;version="1.0"&nbsp;encoding="UTF-8"?&gt;<br/>&lt;!DOCTYPE&nbsp;suite&nbsp;SYSTEM&nbsp;"http://testng.org/testng-1.0.dtd"&gt;<br/>&lt;suite&nbsp;verbose="0"&nbsp;name="Default&nbsp;suite"&gt;<br/>&nbsp;&nbsp;&lt;test&nbsp;verbose="2"&nbsp;name="Default&nbsp;test"&nbsp;preserve-order="false"&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;classes&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;class&nbsp;name="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;/classes&gt;<br/>&nbsp;&nbsp;&lt;/test&gt;<br/>&lt;/suite&gt;<br/></tt></body></html> 
     1<html><head><title>testng.xml for Default suite</title></head><body><tt>&lt;?xml&nbsp;version="1.0"&nbsp;encoding="UTF-8"?&gt;<br/>&lt;!DOCTYPE&nbsp;suite&nbsp;SYSTEM&nbsp;"http://testng.org/testng-1.0.dtd"&gt;<br/>&lt;suite&nbsp;name="Default&nbsp;suite"&gt;<br/>&nbsp;&nbsp;&lt;test&nbsp;verbose="2"&nbsp;name="Default&nbsp;test"&nbsp;preserve-order="true"&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;classes&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;class&nbsp;name="uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;/classes&gt;<br/>&nbsp;&nbsp;&lt;/test&gt;<br/>&lt;/suite&gt;<br/></tt></body></html> 
  • raptor-client/trunk/test-output/Default suite/toc.html

    r1201 r1279  
    1111<td>1 test</td> 
    1212<td><a target='mainFrame' href='classes.html'>1 class</a></td> 
    13 <td>2 methods:<br/> 
     13<td>1 method:<br/> 
    1414&nbsp;&nbsp;<a target='mainFrame' href='methods.html'>chronological</a><br/> 
    1515&nbsp;&nbsp;<a target='mainFrame' href='methods-alphabetical.html'>alphabetical</a><br/> 
     
    2323<table width='100%' class='test-passed'> 
    2424<tr><td> 
    25 <table style='width: 100%'><tr><td valign='top'>Default test (2/0/0)</td><td valign='top' align='right'> 
     25<table style='width: 100%'><tr><td valign='top'>Default test (1/0/0)</td><td valign='top' align='right'> 
    2626  <a href='Default test.html' target='mainFrame'>Results</a> 
    2727</td></tr></table> 
  • raptor-client/trunk/test-output/emailable-report.html

    r1201 r1279  
    3030<table cellspacing=0 cellpadding=0 class="param"> 
    3131<tr><th>Test</th><th class="numi">Methods<br/>Passed</th><th class="numi">Scenarios<br/>Passed</th><th class="numi"># skipped</th><th class="numi"># failed</th><th class="numi">Total<br/>Time</th><th class="numi">Included<br/>Groups</th><th class="numi">Excluded<br/>Groups</th></tr> 
    32 <tr><td style="text-align:left;padding-right:2em">Default test</td><td class="numi">2</td><td class="numi">2</td><td class="numi">0</td><td class="numi">0</td><td class="numi">0.2 seconds</td><td class="numi"></td><td class="numi"></td></tr> 
     32<tr><td style="text-align:left;padding-right:2em">Default test</td><td class="numi">1</td><td class="numi">1</td><td class="numi">0</td><td class="numi">0</td><td class="numi">0.0 seconds</td><td class="numi"></td><td class="numi"></td></tr> 
    3333</table> 
    3434<a id="summary"></a> 
     
    3636<tr><th>Class</th><th>Method</th><th># of<br/>Scenarios</th><th>Time<br/>(Msecs)</th></tr> 
    3737<tr><th colspan="4">Default test &#8212; passed</th></tr> 
    38 <tr class="passedodd"><td rowspan="2">uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest<td><a href="#m1"><b>cacheTest</b>  </a></td><td class="numi">1</td><td class="numi">92</td></tr><tr class="passedodd"><td><a href="#m2"><b>getAttributesTest</b>  </a></td><td class="numi">1</td><td class="numi">5</td></tr> 
     38<tr class="passedodd"><td rowspan="1">uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest<td><a href="#m1"><b>getTrustStoreLocationTest</b>  </a></td><td class="numi">1</td><td class="numi">9</td></tr> 
    3939</table> 
    4040<h1>Default test</h1> 
    41 <a id="m1"></a><h2>uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest:cacheTest</h2> 
    42 <p class="totop"><a href="#summary">back to summary</a></p> 
    43 <a id="m2"></a><h2>uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest:getAttributesTest</h2> 
     41<a id="m1"></a><h2>uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest:getTrustStoreLocationTest</h2> 
    4442<p class="totop"><a href="#summary">back to summary</a></p> 
    4543</body></html> 
  • raptor-client/trunk/test-output/index.html

    r1201 r1279  
    55<h2><p align='center'>Test results</p></h2> 
    66<table border='1' width='100%' class='main-page'><tr><th>Suite</th><th>Passed</th><th>Failed</th><th>Skipped</th><th>testng.xml</th></tr> 
    7 <tr align='center' class='invocation-passed'><td><em>Total</em></td><td><em>2</em></td><td><em>0</em></td><td><em>0</em></td><td>&nbsp;</td></tr> 
     7<tr align='center' class='invocation-passed'><td><em>Total</em></td><td><em>1</em></td><td><em>0</em></td><td><em>0</em></td><td>&nbsp;</td></tr> 
    88<tr align='center' class='invocation-passed'><td><a href='Default suite/index.html'>Default suite</a></td> 
    9 <td>2</td><td>0</td><td>0</td><td><a href='Default suite/testng.xml.html'>Link</a></td></tr></table></body></html> 
     9<td>1</td><td>0</td><td>0</td><td><a href='Default suite/testng.xml.html'>Link</a></td></tr></table></body></html> 
  • raptor-client/trunk/test-output/testng-results.xml

    r1202 r1279  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <testng-results skipped="0" failed="0" total="2" passed="2"> 
     2<testng-results skipped="0" failed="0" total="1" passed="1"> 
    33  <reporter-output> 
    44  </reporter-output> 
    5   <suite name="Default suite" duration-ms="227" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z"> 
     5  <suite name="Default suite" duration-ms="21" started-at="2011-12-08T10:58:23Z" finished-at="2011-12-08T10:58:23Z"> 
    66    <groups> 
    77    </groups> 
    8     <test name="Default test" duration-ms="227" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z"> 
    9       <class name="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest"> 
    10         <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="119" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z"> 
    11         </test-method> 
    12         <test-method status="PASS" signature="cacheTest()" name="cacheTest" duration-ms="92" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z"> 
    13         </test-method> 
    14         <test-method status="PASS" signature="getAttributesTest()" name="getAttributesTest" duration-ms="5" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z"> 
     8    <test name="Default test" duration-ms="21" started-at="2011-12-08T10:58:23Z" finished-at="2011-12-08T10:58:23Z"> 
     9      <class name="uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest"> 
     10        <test-method status="PASS" signature="getTrustStoreLocationTest()[pri:0, instance:uk.ac.cardiff.raptor.remoting.client.sei.impl.ClientTLSParametersTest@162200d5]" name="getTrustStoreLocationTest" duration-ms="9" started-at="2011-12-08T10:58:23Z" finished-at="2011-12-08T10:58:23Z"> 
    1511        </test-method> 
    1612      </class> 
Note: See TracChangeset for help on using the changeset viewer.