cvs commit: xml-rpc/src/java/org/apache/xmlrpc/secure SecurityTool.java

[dl...@apache.org]

dlr         02/02/25 09:09:53

  Modified:    src/java/org/apache/xmlrpc/secure SecurityTool.java
  Log:
  Applied patch by Kristian Meier <kr...@jentro.com>.  The following
  two descriptions were supplied in different messages:
  
  "we are going to use the webserver in our new release. for this we need
  SSL. there is a quite convinient tool for setting up the neccassary
  ssl-system-properties, the SecurityTools. but unfortunatly there is no
  setter-method for the TrustStorePassword and the getter uses the
  DEFAULT_KEY_PASSWORD if not set."
  
  "there is no setter for the trustStorePassword, so I included it along
  with javadocs.
  
  the second one is just a typo, where the keyStorePassword is checked on
  null, this check must be on the trustStorePassword, since we are in the
  getTrustStorePassword-method."
  
  Revision  Changes    Path
  1.2       +13 -3     xml-rpc/src/java/org/apache/xmlrpc/secure/SecurityTool.java
  
  Index: SecurityTool.java
  ===================================================================
  RCS file: /home/cvs/xml-rpc/src/java/org/apache/xmlrpc/secure/SecurityTool.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- SecurityTool.java	20 Jul 2001 19:38:20 -0000	1.1
  +++ SecurityTool.java	25 Feb 2002 17:09:52 -0000	1.2
  @@ -428,9 +428,19 @@
       }        
   
       /**
  -     * Get the key store password.
  +     * Set the trust store password.
        *
  -     * @return String key store password.
  +     * @param String  trust store password.
  +     */
  +    public static void setTrustStorePassword(String x)
  +    {
  +        trustStorePassword = x;
  +    }        
  +
  +    /**
  +     * Get the trust store password.
  +     *
  +     * @return String trust store password.
        */
       public static String getTrustStorePassword()
       {
  @@ -438,7 +448,7 @@
           {
               return System.getProperty(TRUST_STORE_PASSWORD);
           }
  -        if (keyStorePassword == null)
  +        if (trustStorePassword == null)
           {
               return DEFAULT_TRUST_STORE_PASSWORD;
           }