java/security/Makefile.am: removed Engine.java

java/security/AlgorithmParameterGenerator.java
java/security/AlgorithmParameters.java
java/security/KeyFactory.java
java/security/KeyPairGenerator.java
java/security/KeyStore.java
java/security/MessageDigest.java
java/security/SecureRandom.java
java/security/Signature.java
  accomodate changes to Engine class.

java/security/cert/Certificate.java: Added writeReplace()
  method.
java/security/cert/CertificateFactory.java: (JDK 1.4 compatibility)
  (getInstance(String)) and modified to use generic getInstance
  method.
  (getInstance(String, String)) likewise.
  getInstance(String, Provider) method added.
  getInstance(String, String, Provider) method removed.
  generateCertPath(InputStream) method added.
  generateCertPath(InputStream, String) method added.
  generateCertPath(List) method added.
  getCertPathEncodings() method added.
java/security/cert/CertificateFactorySpi.java: (1.4 compatibility)
  engineGenerateCertPath(InputStream) method added.
  engineGenerateCertPath(InputStream, String) method added.
  engineGenerateCertPath(List) method added.
  engineGetCertPathEncodings() method added.

1 files changed, 7 insertions, 1 deletions

diff --git a/java/security/AlgorithmParameterGenerator.java b/java/security/AlgorithmParameterGenerator.java
index b8ad8e27d..26a7790d3 100644
--- a/java/security/AlgorithmParameterGenerator.java
+++ b/java/security/AlgorithmParameterGenerator.java
@@ -39,6 +39,8 @@ package java.security;
 
 import java.security.spec.AlgorithmParameterSpec;
 
+import gnu.java.security.Engine;
+
 /**
  * <p>The <code>AlgorithmParameterGenerator</code> class is used to generate a
  * set of parameters to be used with a certain algorithm. Parameter generators
@@ -201,7 +203,11 @@ public class AlgorithmParameterGenerator
 	  (AlgorithmParameterGeneratorSpi) Engine.getInstance(
 	    ALGORITHM_PARAMETER_GENERATOR, algorithm, provider),
 	  provider, algorithm);
-        }
+      }
+    catch (java.lang.reflect.InvocationTargetException ite)
+      {
+	throw new NoSuchAlgorithmException(algorithm);
+      }
     catch (ClassCastException cce)
       {
 	throw new NoSuchAlgorithmException(algorithm);