[gate-cvs] SF.net SVN: gate:[20323] teamware/trunk

[<ian...@us...>]

Revision: 20323
          http://sourceforge.net/p/gate/code/20323
Author:   ian_roberts
Date:     2018-12-20 10:32:16 +0000 (Thu, 20 Dec 2018)
Log Message:
-----------
Workaround for a bug in the version of CXF we're using, where it uses the default *KeyManagerFactory* algorithm instead of the default *TrustManagerFactory* algorithm when creating trust managers.  This used to not be an issue, but since we changed the proxy SSL certificate the SunX509 trust manager algorithm doesn't trust us, but the (usual default) PKIX algorithm does.  So we explicitly set PKIX as the algorithm now.

Modified Paths:
--------------
    teamware/trunk/annic-gui/resources/conf/cxf.xml
    teamware/trunk/annotation-diff-gui/resources/conf/cxf.xml
    teamware/trunk/annotator-gui/resources/conf/cxf.xml
    teamware/trunk/doc-service/conf/https-client.xml
    teamware/trunk/executive/src/service/gleam/executive/service/applicationContext-https.xml
    teamware/trunk/gate-service/server/endpoint/conf/https-client.xml
    teamware/trunk/gate-service/server/worker/conf/cxf.xml
    teamware/trunk/service-datastore/src/cxf.xml

Modified: teamware/trunk/annic-gui/resources/conf/cxf.xml
===================================================================
--- teamware/trunk/annic-gui/resources/conf/cxf.xml	2018-11-27 15:49:02 UTC (rev 20322)
+++ teamware/trunk/annic-gui/resources/conf/cxf.xml	2018-12-20 10:32:16 UTC (rev 20323)
@@ -11,7 +11,7 @@
   HTTPS server certificates when connecting to an HTTPS service -->
   <http:conduit name="*.http-conduit">
     <http:tlsClientParameters>
-      <sec:trustManagers>
+      <sec:trustManagers factoryAlgorithm="PKIX">
         <sec:keyStore type="JKS" password="@TRUSTSTORE_PASSWORD@"
            resource="trusted-certs.keystore" />
       </sec:trustManagers>

Modified: teamware/trunk/annotation-diff-gui/resources/conf/cxf.xml
===================================================================
--- teamware/trunk/annotation-diff-gui/resources/conf/cxf.xml	2018-11-27 15:49:02 UTC (rev 20322)
+++ teamware/trunk/annotation-diff-gui/resources/conf/cxf.xml	2018-12-20 10:32:16 UTC (rev 20323)
@@ -11,7 +11,7 @@
   HTTPS server certificates when connecting to an HTTPS service -->
   <http:conduit name="*.http-conduit">
     <http:tlsClientParameters>
-      <sec:trustManagers>
+      <sec:trustManagers factoryAlgorithm="PKIX">
         <sec:keyStore type="JKS" password="@TRUSTSTORE_PASSWORD@"
            resource="trusted-certs.keystore" />
       </sec:trustManagers>

Modified: teamware/trunk/annotator-gui/resources/conf/cxf.xml
===================================================================
--- teamware/trunk/annotator-gui/resources/conf/cxf.xml	2018-11-27 15:49:02 UTC (rev 20322)
+++ teamware/trunk/annotator-gui/resources/conf/cxf.xml	2018-12-20 10:32:16 UTC (rev 20323)
@@ -11,7 +11,7 @@
   HTTPS server certificates when connecting to an HTTPS service -->
   <http:conduit name="*.http-conduit">
     <http:tlsClientParameters>
-      <sec:trustManagers>
+      <sec:trustManagers factoryAlgorithm="PKIX">
         <sec:keyStore type="JKS" password="@TRUSTSTORE_PASSWORD@"
            resource="trusted-certs.keystore" />
       </sec:trustManagers>

Modified: teamware/trunk/doc-service/conf/https-client.xml
===================================================================
--- teamware/trunk/doc-service/conf/https-client.xml	2018-11-27 15:49:02 UTC (rev 20322)
+++ teamware/trunk/doc-service/conf/https-client.xml	2018-12-20 10:32:16 UTC (rev 20323)
@@ -11,7 +11,7 @@
   HTTPS server certificates when connecting to an HTTPS service -->
   <http:conduit name="*.http-conduit">
     <http:tlsClientParameters>
-      <sec:trustManagers>
+      <sec:trustManagers factoryAlgorithm="PKIX">
         <sec:keyStore type="JKS" password="@TRUSTSTORE_PASSWORD@"
            resource="trusted-certs.keystore" />
       </sec:trustManagers>

Modified: teamware/trunk/executive/src/service/gleam/executive/service/applicationContext-https.xml
===================================================================
--- teamware/trunk/executive/src/service/gleam/executive/service/applicationContext-https.xml	2018-11-27 15:49:02 UTC (rev 20322)
+++ teamware/trunk/executive/src/service/gleam/executive/service/applicationContext-https.xml	2018-12-20 10:32:16 UTC (rev 20323)
@@ -11,7 +11,7 @@
   HTTPS server certificates when connecting to an HTTPS service -->
   <http:conduit name="*.http-conduit">
     <http:tlsClientParameters>
-      <sec:trustManagers>
+      <sec:trustManagers factoryAlgorithm="PKIX">
         <sec:keyStore type="JKS" password="@TRUSTSTORE_PASSWORD@"
            resource="gleam/executive/service/trusted-certs.keystore" />
       </sec:trustManagers>

Modified: teamware/trunk/gate-service/server/endpoint/conf/https-client.xml
===================================================================
--- teamware/trunk/gate-service/server/endpoint/conf/https-client.xml	2018-11-27 15:49:02 UTC (rev 20322)
+++ teamware/trunk/gate-service/server/endpoint/conf/https-client.xml	2018-12-20 10:32:16 UTC (rev 20323)
@@ -11,7 +11,7 @@
   HTTPS server certificates when connecting to an HTTPS service -->
   <http:conduit name="*.http-conduit">
     <http:tlsClientParameters>
-      <sec:trustManagers>
+      <sec:trustManagers factoryAlgorithm="PKIX">
         <sec:keyStore type="JKS" password="@TRUSTSTORE_PASSWORD@"
            resource="trusted-certs.keystore" />
       </sec:trustManagers>

Modified: teamware/trunk/gate-service/server/worker/conf/cxf.xml
===================================================================
--- teamware/trunk/gate-service/server/worker/conf/cxf.xml	2018-11-27 15:49:02 UTC (rev 20322)
+++ teamware/trunk/gate-service/server/worker/conf/cxf.xml	2018-12-20 10:32:16 UTC (rev 20323)
@@ -11,7 +11,7 @@
   HTTPS server certificates when connecting to an HTTPS service -->
   <http:conduit name="*.http-conduit">
     <http:tlsClientParameters>
-      <sec:trustManagers>
+      <sec:trustManagers factoryAlgorithm="PKIX">
         <sec:keyStore type="JKS" password="@TRUSTSTORE_PASSWORD@"
            resource="trusted-certs.keystore" />
       </sec:trustManagers>

Modified: teamware/trunk/service-datastore/src/cxf.xml
===================================================================
--- teamware/trunk/service-datastore/src/cxf.xml	2018-11-27 15:49:02 UTC (rev 20322)
+++ teamware/trunk/service-datastore/src/cxf.xml	2018-12-20 10:32:16 UTC (rev 20323)
@@ -11,7 +11,7 @@
   HTTPS server certificates when connecting to an HTTPS service -->
   <http:conduit name="*.http-conduit">
     <http:tlsClientParameters>
-      <sec:trustManagers>
+      <sec:trustManagers factoryAlgorithm="PKIX">
         <sec:keyStore type="JKS" password="@TRUSTSTORE_PASSWORD@"
            resource="trusted-certs.keystore" />
       </sec:trustManagers>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.