You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2007/06/25 17:02:12 UTC
svn commit: r550523 [1/2] - in /geronimo/server/trunk/modules:
geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/
geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/
geronimo-naming/src/main/java/org...
Author: rickmcguire
Date: Mon Jun 25 08:02:09 2007
New Revision: 550523
URL: http://svn.apache.org/viewvc?view=rev&rev=550523
Log:
GERONIMO-3246 Cleanup exception handling so stack traces for first failures are not discarded.
Modified:
geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java
geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificatePropertiesFileLoginModule.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModule.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RepeatedFailureLockoutLoginModule.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/BaseMarkupSerializer.java
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManager.java
geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1OctetString.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1Set.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/BERConstructedOctetString.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERBitString.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERUniversalString.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/pkcs/PrivateKeyInfo.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/V2TBSCertListGenerator.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/X509DefaultEntryConverter.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Base64.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Hex.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/UrlBase64.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/PKCS10CertificationRequest.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509Principal.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509V1CertificateGenerator.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPrivateKey.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPublicKey.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPrivateCrtKey.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPublicKey.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPrivateKey.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPublicKey.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKKeyFactory.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLEntryObject.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLObject.java
geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CertificateObject.java
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/PortInfo.java
geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/SharedPortInfo.java
geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/WebServiceContainerInvoker.java
geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/SocketFactory.java
Modified: geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/modules/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java Mon Jun 25 08:02:09 2007
@@ -225,7 +225,7 @@
URL url = DeploymentUtil.createJarURL(webModule.getModuleFile(), "META-INF/faces-config.xml");
parseConfigFile(url, classLoader, classes);
} catch (MalformedURLException mfe) {
- throw new DeploymentException("Could not locate META-INF/faces-config.xml" + mfe.getMessage());
+ throw new DeploymentException("Could not locate META-INF/faces-config.xml" + mfe.getMessage(), mfe);
}
// 2. WEB-INF/faces-config.xml
@@ -233,7 +233,7 @@
URL url = DeploymentUtil.createJarURL(webModule.getModuleFile(), "WEB-INF/faces-config.xml");
parseConfigFile(url, classLoader, classes);
} catch (MalformedURLException mfe) {
- throw new DeploymentException("Could not locate WEB-INF/faces-config.xml" + mfe.getMessage());
+ throw new DeploymentException("Could not locate WEB-INF/faces-config.xml" + mfe.getMessage(), mfe);
}
// 3. javax.faces.CONFIG_FILES
@@ -252,7 +252,7 @@
URL url = DeploymentUtil.createJarURL(webModule.getModuleFile(), configfile);
parseConfigFile(url, classLoader, classes);
} catch (MalformedURLException mfe) {
- throw new DeploymentException("Could not locate config file " + configfile + ", " + mfe.getMessage());
+ throw new DeploymentException("Could not locate config file " + configfile + ", " + mfe.getMessage(), mfe);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Mon Jun 25 08:02:09 2007
@@ -273,7 +273,7 @@
try {
clazz = cl.loadClass(interfaceName);
} catch (ClassNotFoundException e) {
- throw new DeploymentException(interfaceType + " interface class not found: " + interfaceName);
+ throw new DeploymentException(interfaceType + " interface class not found: " + interfaceName, e);
}
if (!clazz.isInterface()) {
throw new DeploymentException(interfaceType + " interface is not an interface: " + interfaceName);
@@ -282,7 +282,7 @@
try {
superInterface = cl.loadClass(superInterfaceName);
} catch (ClassNotFoundException e) {
- throw new DeploymentException("Class " + superInterfaceName + " could not be loaded");
+ throw new DeploymentException("Class " + superInterfaceName + " could not be loaded", e);
}
if (!superInterface.isAssignableFrom(clazz)) {
throw new DeploymentException(interfaceType + " interface does not extend " + superInterfaceName + ": " + interfaceName);
Modified: geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java Mon Jun 25 08:02:09 2007
@@ -134,7 +134,7 @@
try {
instance = kernel.getGBean(abstractName);
} catch (GBeanNotFoundException e) {
- throw new NamingException("GBean not found: " + abstractName);
+ throw (NamingException)new NamingException("GBean not found: " + abstractName).initCause(e);
}
// create the bindings for this object
Modified: geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java Mon Jun 25 08:02:09 2007
@@ -134,7 +134,7 @@
try {
instance = kernel.getGBean(abstractName);
} catch (GBeanNotFoundException e) {
- throw new NamingException("GBean not found: " + abstractName);
+ throw (NamingException)new NamingException("GBean not found: " + abstractName).initCause(e);
}
// preprocess the instance
Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Mon Jun 25 08:02:09 2007
@@ -407,7 +407,7 @@
// extract the ejbJar file into a standalone packed jar file and add the contents to the output
earContext.addIncludeAsPackedJar(URI.create(module.getTargetPath()), moduleFile);
} catch (IOException e) {
- throw new DeploymentException("Unable to copy ejb module jar into configuration: " + moduleFile.getName());
+ throw new DeploymentException("Unable to copy ejb module jar into configuration: " + moduleFile.getName(), e);
}
}
@@ -511,7 +511,6 @@
try {
appInfo = openEjbSystem.configureApplication(appModule);
} catch (OpenEJBException e) {
- e.printStackTrace();
throw new DeploymentException(e);
}
@@ -686,7 +685,7 @@
try {
resourceAdapterAbstractName = earContext.findGBean(resourceAdapterNameQuery);
} catch (GBeanNotFoundException e) {
- throw new DeploymentException("Resource Adapter for MDB '" + bean.getEjbName() + "'not found: " + resourceAdapterNameQuery);
+ throw new DeploymentException("Resource Adapter for MDB '" + bean.getEjbName() + "'not found: " + resourceAdapterNameQuery, e);
}
Map properties = resourceAdapterAbstractName.getName();
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java Mon Jun 25 08:02:09 2007
@@ -83,7 +83,7 @@
String s = (String) options.get(OPTION_SERVICENAME);
serviceName = s != null ? new ObjectName(s) : null;
} catch (MalformedObjectNameException e) {
- throw new IllegalArgumentException("option " + OPTION_SERVICENAME + "is not a valid ObjectName: " + options.get(OPTION_SERVICENAME));
+ throw new IllegalArgumentException("option " + OPTION_SERVICENAME + "is not a valid ObjectName: " + options.get(OPTION_SERVICENAME), e);
}
if (port != null || kernelName != null) {
service = connect();
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java Mon Jun 25 08:02:09 2007
@@ -238,7 +238,7 @@
try {
session.getHandler().setClientResponse(results);
} catch (IllegalArgumentException iae) {
- throw new LoginException(iae.toString());
+ throw (LoginException)new LoginException(iae.getMessage()).initCause(iae);
}
return session.getLoginModule(loginModuleIndex).login();
}
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java Mon Jun 25 08:02:09 2007
@@ -292,13 +292,13 @@
keystore.setKeyEntry(alias, keyPair.getPrivate(), keyPassword, new Certificate[] { cert });
privateKeys.add(alias);
} catch (KeyStoreException e) {
- throw new KeystoreException("Unable to generate key pair in keystore '" + keystoreName + "'");
+ throw new KeystoreException("Unable to generate key pair in keystore '" + keystoreName + "'", e);
} catch (InvalidKeyException e) {
- throw new KeystoreException("Unable to generate key pair in keystore '" + keystoreName + "'");
+ throw new KeystoreException("Unable to generate key pair in keystore '" + keystoreName + "'", e);
} catch (SignatureException e) {
- throw new KeystoreException("Unable to generate key pair in keystore '" + keystoreName + "'");
+ throw new KeystoreException("Unable to generate key pair in keystore '" + keystoreName + "'", e);
} catch (NoSuchAlgorithmException e) {
- throw new KeystoreException("Unable to generate key pair in keystore '" + keystoreName + "'");
+ throw new KeystoreException("Unable to generate key pair in keystore '" + keystoreName + "'", e);
}
saveKeystore(storePassword);
}
@@ -465,11 +465,11 @@
}
return keyFactory.getKeyManagers();
} catch (KeyStoreException e) {
- throw new KeystoreException("Unable to retrieve key manager in keystore '" + keystoreName + "' for alias '" + alias + "'");
+ throw new KeystoreException("Unable to retrieve key manager in keystore '" + keystoreName + "' for alias '" + alias + "'", e);
} catch (NoSuchAlgorithmException e) {
- throw new KeystoreException("Unable to retrieve key manager in keystore '" + keystoreName + "' for alias '" + alias + "'");
+ throw new KeystoreException("Unable to retrieve key manager in keystore '" + keystoreName + "' for alias '" + alias + "'", e);
} catch (UnrecoverableKeyException e) {
- throw new KeystoreException("Unable to retrieve key manager in keystore '" + keystoreName + "' for alias '" + alias + "'");
+ throw new KeystoreException("Unable to retrieve key manager in keystore '" + keystoreName + "' for alias '" + alias + "'", e);
}
}
@@ -480,9 +480,9 @@
trustFactory.init(keystore);
return trustFactory.getTrustManagers();
} catch (KeyStoreException e) {
- throw new KeystoreException("Unable to retrieve trust manager in keystore '" + keystoreName + "'");
+ throw new KeystoreException("Unable to retrieve trust manager in keystore '" + keystoreName + "'", e);
} catch (NoSuchAlgorithmException e) {
- throw new KeystoreException("Unable to retrieve trust manager in keystore '" + keystoreName + "'");
+ throw new KeystoreException("Unable to retrieve trust manager in keystore '" + keystoreName + "'", e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java Mon Jun 25 08:02:09 2007
@@ -157,7 +157,7 @@
}
data.setAttribute("keystorePath", new URI(path +name));
} catch (URISyntaxException e) {
- throw new IllegalStateException("Can't resolve keystore path: "+e.getMessage());
+ throw new IllegalStateException("Can't resolve keystore path: "+e.getMessage(), e);
}
data.setReferencePattern("ServerInfo", kernel.getAbstractNameFor(serverInfo));
data.setAttribute("keystoreName", name);
@@ -168,7 +168,7 @@
return (KeystoreInstance) kernel.getProxyManager().createProxy(aName, KeystoreInstance.class);
} catch (InvalidConfigException e) {
log.error("Should never happen", e);
- throw new IllegalStateException("Unable to add Keystore GBean ("+e.getMessage()+")");
+ throw new IllegalStateException("Unable to add Keystore GBean ("+e.getMessage()+")", e);
} finally {
ConfigurationUtil.releaseConfigurationManager(kernel, mgr);
}
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificatePropertiesFileLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificatePropertiesFileLoginModule.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificatePropertiesFileLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificatePropertiesFileLoginModule.java Mon Jun 25 08:02:09 2007
@@ -81,7 +81,7 @@
loadProperties(serverInfo, usersURI, groupsURI);
} catch (Exception e) {
log.error(e);
- throw new IllegalArgumentException("Unable to configure properties file login module: "+e);
+ throw new IllegalArgumentException("Unable to configure properties file login module: "+e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java Mon Jun 25 08:02:09 2007
@@ -70,7 +70,7 @@
try {
handler.handle(callbacks);
} catch (Exception e) {
- throw new LoginException("Unable to process callback: "+e);
+ throw (LoginException)new LoginException("Unable to process callback: "+e.getMessage()).initCause(e);
}
if(callbacks.length != 1) {
throw new IllegalStateException("Number of callbacks changed by server!");
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModule.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModule.java Mon Jun 25 08:02:09 2007
@@ -72,7 +72,7 @@
loadProperties(serverInfo, usersURI);
} catch (Exception e) {
log.error("Initialization failed", e);
- throw new IllegalArgumentException("Unable to configure properties file login module: " + e.getMessage());
+ throw new IllegalArgumentException("Unable to configure properties file login module: " + e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java Mon Jun 25 08:02:09 2007
@@ -88,7 +88,7 @@
MessageDigest.getInstance(digest);
} catch(NoSuchAlgorithmException e) {
log.error("Initialization failed. Digest algorithm "+digest+" is not available.", e);
- throw new IllegalArgumentException("Unable to configure properties file login module: "+e.getMessage());
+ throw new IllegalArgumentException("Unable to configure properties file login module: "+e.getMessage(), e);
}
if(encoding != null && !"hex".equalsIgnoreCase(encoding) && !"base64".equalsIgnoreCase(encoding)) {
log.error("Initialization failed. Digest Encoding "+encoding+" is not supported.");
@@ -103,7 +103,7 @@
loadProperties(serverInfo, usersURI, groupsURI);
} catch (Exception e) {
log.error("Initialization failed", e);
- throw new IllegalArgumentException("Unable to configure properties file login module: "+e.getMessage());
+ throw new IllegalArgumentException("Unable to configure properties file login module: "+e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RepeatedFailureLockoutLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RepeatedFailureLockoutLoginModule.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RepeatedFailureLockoutLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RepeatedFailureLockoutLoginModule.java Mon Jun 25 08:02:09 2007
@@ -104,7 +104,7 @@
try {
handler.handle(callbacks);
} catch (Exception e) {
- throw new LoginException("Unable to process callback: "+e);
+ throw (LoginException)new LoginException("Unable to process callback: "+e.getMessage()).initCause(e);
}
if(callbacks.length != 1) {
throw new IllegalStateException("Number of callbacks changed by server!");
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java Mon Jun 25 08:02:09 2007
@@ -117,7 +117,7 @@
MessageDigest.getInstance(digest);
} catch(NoSuchAlgorithmException e) {
log.error("Initialization failed. Digest algorithm "+digest+" is not available.", e);
- throw new IllegalArgumentException("Unable to configure SQL login module: "+e.getMessage());
+ throw new IllegalArgumentException("Unable to configure SQL login module: "+e.getMessage(), e);
}
if(encoding != null && !"hex".equalsIgnoreCase(encoding) && !"base64".equalsIgnoreCase(encoding)) {
log.error("Initialization failed. Digest Encoding "+encoding+" is not supported.");
@@ -167,9 +167,9 @@
try {
driver = (Driver) cl.loadClass((String) options.get(DRIVER)).newInstance();
} catch (ClassNotFoundException e) {
- throw new IllegalArgumentException("Driver class " + options.get(DRIVER) + " is not available. Perhaps you need to add it as a dependency in your deployment plan?");
+ throw new IllegalArgumentException("Driver class " + options.get(DRIVER) + " is not available. Perhaps you need to add it as a dependency in your deployment plan?", e);
} catch (Exception e) {
- throw new IllegalArgumentException("Unable to load, instantiate, register driver " + options.get(DRIVER) + ": " + e.getMessage());
+ throw new IllegalArgumentException("Unable to load, instantiate, register driver " + options.get(DRIVER) + ": " + e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java Mon Jun 25 08:02:09 2007
@@ -37,7 +37,7 @@
target = new URI("async", null, host, port, "/JMX", null, JaasLoginServiceRemotingServer.REQUIRED_OBJECT_NAME.getCanonicalName());
return create(target);
} catch (URISyntaxException e) {
- throw new IllegalArgumentException("Bad host or port.");
+ throw new IllegalArgumentException("Bad host or port.", e);
} catch (IOException e) {
throw new RuntimeException("IOException: "+e.getMessage(), e);
}
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/BaseMarkupSerializer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/BaseMarkupSerializer.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/BaseMarkupSerializer.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/BaseMarkupSerializer.java Mon Jun 25 08:02:09 2007
@@ -355,7 +355,7 @@
try {
prepare();
} catch ( IOException except ) {
- throw new SAXException( except.toString() );
+ throw (SAXException)new SAXException( except.toString() ).initCause(except);
}
// Nothing to do here. All the magic happens in startDocument(String)
}
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java Mon Jun 25 08:02:09 2007
@@ -51,7 +51,7 @@
try {
actualChecksum = calculateChecksum(file, "SHA-1");
} catch (NoSuchAlgorithmException e) {
- throw new IOException("SHA-1 algorithm not available");
+ throw (IOException)new IOException("SHA-1 algorithm not available").initCause(e);
}
// write it
@@ -191,7 +191,7 @@
digester = MessageDigest.getInstance("SHA-1");
digester.reset();
} catch (NoSuchAlgorithmException e) {
- throw new IOException("SHA-1 algorithm not available");
+ throw (IOException)new IOException("SHA-1 algorithm not available").initCause(e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java Mon Jun 25 08:02:09 2007
@@ -650,7 +650,7 @@
return attributeStringValue;
} catch (ClassNotFoundException e) {
//todo: use the Configuration's ClassLoader to load the attribute, if this ever becomes an issue
- throw new InvalidAttributeException("Unable to store attribute type " + type);
+ throw (InvalidAttributeException)new InvalidAttributeException("Unable to store attribute type " + type).initCause(e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java Mon Jun 25 08:02:09 2007
@@ -873,9 +873,9 @@
} catch (Exception e) {
Throwable cause = unwrapJMException(e);
if (cause instanceof InstanceNotFoundException) {
- throw new InternalKernelException("Kernel is not loaded");
+ throw new InternalKernelException("Kernel is not loaded", cause);
} else if (cause instanceof AttributeNotFoundException) {
- throw new InternalKernelException("KernelDelegate is out of synch with Kernel");
+ throw new InternalKernelException("KernelDelegate is out of synch with Kernel", cause);
} else {
throw new InternalKernelException(cause);
}
@@ -891,7 +891,7 @@
} catch (Exception e) {
Throwable cause = unwrapJMException(e);
if (cause instanceof InstanceNotFoundException) {
- throw new InternalKernelException("Kernel is not loaded");
+ throw new InternalKernelException("Kernel is not loaded", cause);
} else if (cause instanceof NoSuchMethodException) {
StringBuffer buf = new StringBuffer("KernelDelegate is out of synch with Kernel on ");
buf.append(methodName).append("(");
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java Mon Jun 25 08:02:09 2007
@@ -121,11 +121,11 @@
try {
return kernel.getAttribute(abstractName, attribute);
} catch (NoSuchAttributeException e) {
- throw new AttributeNotFoundException(attribute);
+ throw (AttributeNotFoundException)new AttributeNotFoundException(attribute).initCause(e);
} catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
+ throw (InstanceNotFoundException)new InstanceNotFoundException(name.getCanonicalName()).initCause(e);
} catch (InternalKernelException e) {
- throw new MBeanException(unwrapInternalKernelException(e));
+ throw (MBeanException)new MBeanException(unwrapInternalKernelException(e));
} catch (Exception e) {
throw new MBeanException(e);
}
@@ -142,7 +142,7 @@
} catch (NoSuchAttributeException e) {
// ignored - caller will simply find no value
} catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
+ throw (InstanceNotFoundException)new InstanceNotFoundException(name.getCanonicalName()).initCause(e);
} catch (InternalKernelException e) {
throw new ReflectionException(unwrapInternalKernelException(e));
} catch (Exception e) {
@@ -166,7 +166,7 @@
try {
gbeanInfo = kernel.getGBeanInfo(abstractName);
} catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
+ throw (InstanceNotFoundException)new InstanceNotFoundException(name.getCanonicalName()).initCause(e);
} catch (InternalKernelException e) {
throw new ReflectionException(unwrapInternalKernelException(e));
}
@@ -178,10 +178,10 @@
try {
return kernel.invoke(abstractName, operationName, params, signature);
} catch (NoSuchOperationException e) {
- throw new ReflectionException(new NoSuchMethodException(e.getMessage()));
+ throw new ReflectionException((NoSuchMethodException)new NoSuchMethodException(e.getMessage()).initCause(e));
} catch (GBeanNotFoundException e) {
if(name.equals(e.getGBeanName())) {
- throw new InstanceNotFoundException(name.getCanonicalName());
+ throw (InstanceNotFoundException)new InstanceNotFoundException(name.getCanonicalName()).initCause(e);
}
throw new MBeanException(e);
} catch (InternalKernelException e) {
@@ -259,9 +259,9 @@
try {
kernel.setAttribute(abstractName, attributeName, attributeValue);
} catch (NoSuchAttributeException e) {
- throw new AttributeNotFoundException(attributeName);
+ throw (AttributeNotFoundException)new AttributeNotFoundException(attributeName).initCause(e);
} catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
+ throw (InstanceNotFoundException)new InstanceNotFoundException(name.getCanonicalName()).initCause(e);
} catch (InternalKernelException e) {
throw new MBeanException(unwrapInternalKernelException(e));
} catch (Exception e) {
@@ -282,7 +282,7 @@
} catch (NoSuchAttributeException e) {
// ignored - caller will see value was not set because this attribute will not be in the attribute list
} catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(name.getCanonicalName());
+ throw (InstanceNotFoundException)new InstanceNotFoundException(name.getCanonicalName()).initCause(e);
} catch (InternalKernelException e) {
throw new ReflectionException(unwrapInternalKernelException(e));
} catch (Exception e) {
@@ -308,7 +308,7 @@
GBeanInfo gbeanInfo = kernel.getGBeanInfo(abstractName);
return new ObjectInstance(objectName, gbeanInfo.getClassName());
} catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(objectName.getCanonicalName());
+ throw (InstanceNotFoundException)new InstanceNotFoundException(objectName.getCanonicalName()).initCause(e);
}
}
@@ -317,7 +317,7 @@
try {
return kernel.getClassLoaderFor(abstractName);
} catch (GBeanNotFoundException e) {
- throw new InstanceNotFoundException(objectName.getCanonicalName());
+ throw (InstanceNotFoundException)new InstanceNotFoundException(objectName.getCanonicalName()).initCause(e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java Mon Jun 25 08:02:09 2007
@@ -117,7 +117,7 @@
try {
return kernel.getAttribute(abstractName, attributeName);
} catch (NoSuchAttributeException e) {
- throw new AttributeNotFoundException(attributeName);
+ throw (AttributeNotFoundException)new AttributeNotFoundException(attributeName).initCause(e);
} catch (Exception e) {
throw new ReflectionException(e);
}
@@ -129,7 +129,7 @@
try {
kernel.setAttribute(abstractName, attributeName, attributeValue);
} catch (NoSuchAttributeException e) {
- throw new AttributeNotFoundException(attributeName);
+ throw (AttributeNotFoundException)new AttributeNotFoundException(attributeName).initCause(e);
} catch (Exception e) {
throw new ReflectionException(e);
}
@@ -167,7 +167,7 @@
try {
return kernel.invoke(abstractName, operationName, arguments, types);
} catch (NoSuchOperationException e) {
- throw new ReflectionException(new NoSuchMethodException(new GOperationSignature(operationName, types).toString()));
+ throw new ReflectionException((NoSuchMethodException)new NoSuchMethodException(new GOperationSignature(operationName, types).toString()).initCause(e));
} catch (Exception e) {
throw new ReflectionException(e);
}
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java Mon Jun 25 08:02:09 2007
@@ -499,7 +499,7 @@
try {
textPattern = text == null || text.equals("") ? null : Pattern.compile(text);
} catch (PatternSyntaxException e) {
- throw new IllegalArgumentException("Bad regular expression '"+text+"'");
+ throw new IllegalArgumentException("Bad regular expression '"+text+"'", e);
}
// Make sure we can find the log file
File log = new File(substituteSystemProps(logFile));
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Mon Jun 25 08:02:09 2007
@@ -695,7 +695,7 @@
try {
pluginData = loadCARFile(tempFile, false);
} catch (Exception e) {
- throw new IOException("Unable to read plugin metadata: "+e.getMessage());
+ throw (IOException)new IOException("Unable to read plugin metadata: "+e.getMessage()).initCause(e);
}
}
if(pluginData != null) { // it's a plugin, not a plain JAR
@@ -757,9 +757,9 @@
downloadArtifact(artifact, metadata, repos, username, password, monitor, soFar, true);
}
} catch (NoSuchConfigException e) {
- throw new IllegalStateException("Installed configuration into repository but ConfigStore does not see it: "+e.getMessage());
+ throw new IllegalStateException("Installed configuration into repository but ConfigStore does not see it: "+e.getMessage(), e);
} catch (InvalidConfigException e) {
- throw new IllegalStateException("Installed configuration into repository but ConfigStore cannot load it: "+e.getMessage());
+ throw new IllegalStateException("Installed configuration into repository but ConfigStore cannot load it: "+e.getMessage(), e);
}
// Copy any files out of the artifact
PluginMetadata currentPlugin = configManager.isConfiguration(configID) ? getPluginMetadata(configID) : null;
@@ -778,7 +778,7 @@
try {
set = configStore.resolve(configID, null, data.getSourceFile());
} catch (NoSuchConfigException e) {
- throw new IllegalStateException("Unable to identify module "+configID+" to copy files from");
+ throw new IllegalStateException("Unable to identify module "+configID+" to copy files from", e);
}
if(set.size() == 0) {
log.error("Installed configuration into repository but cannot locate file to copy "+data.getSourceFile());
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java Mon Jun 25 08:02:09 2007
@@ -211,7 +211,7 @@
//return new java.net.URI(uri.getScheme(),uri.getHost(),uri.getPath(),uri.);
uri = new java.net.URI(request.getScheme(), null, request.getServerName(), request.getServerPort(), request.getRequestURI(), request.getQueryString(), null);
} catch (URISyntaxException e) {
- throw new IllegalStateException(e.getMessage());
+ throw new IllegalStateException(e.getMessage(), e);
}
}
return uri;
Modified: geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManager.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManager.java Mon Jun 25 08:02:09 2007
@@ -67,7 +67,7 @@
int status = importedTransaction.getStatus();
assert status == Status.STATUS_ACTIVE || status == Status.STATUS_PREPARED: "invalid status: " + status;
} catch (SystemException e) {
- throw new XAException();
+ throw (XAException)new XAException().initCause(e);
}
commit(importedTransaction, onePhase);
}
@@ -108,7 +108,7 @@
int status = importedTransaction.getStatus();
assert status == Status.STATUS_ACTIVE;
} catch (SystemException e) {
- throw new XAException();
+ throw (XAException)new XAException().initCause(e);
}
return prepare(importedTransaction);
}
@@ -162,7 +162,7 @@
int status = importedTransaction.getStatus();
assert status == Status.STATUS_ACTIVE || status == Status.STATUS_PREPARED;
} catch (SystemException e) {
- throw new XAException();
+ throw (XAException)new XAException().initCause(e);
}
rollback(importedTransaction);
}
@@ -183,7 +183,7 @@
resume(importedTransaction);
} catch (InvalidTransactionException e) {
// this occures if our transaciton is associated with another thread
- throw new ImportedTransactionActiveException(xid);
+ throw (ImportedTransactionActiveException)new ImportedTransactionActiveException(xid).initCause(e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java Mon Jun 25 08:02:09 2007
@@ -177,7 +177,7 @@
associate(tx);
} catch (InvalidTransactionException e) {
// should not be possible since we just created that transaction and no one has a reference yet
- throw new SystemException("Internal error: associate threw an InvalidTransactionException for a newly created transaction");
+ throw (SystemException)new SystemException("Internal error: associate threw an InvalidTransactionException for a newly created transaction").initCause(e);
}
// Todo: Verify if this is correct thing to do. Use default timeout for next transaction.
this.transactionTimeoutMilliseconds.set(null);
Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java Mon Jun 25 08:02:09 2007
@@ -260,7 +260,7 @@
try {
targetName = ObjectName.getInstance(targetNameString);
} catch (MalformedObjectNameException e) {
- throw new XmlException("Invalid object name: " + targetNameString);
+ throw (XmlException)new XmlException("Invalid object name: " + targetNameString).initCause(e);
}
return targetName;
}
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1OctetString.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1OctetString.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1OctetString.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1OctetString.java Mon Jun 25 08:02:09 2007
@@ -102,7 +102,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("Error processing object : " + e.toString());
+ throw new IllegalArgumentException("Error processing object : " + e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1Set.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1Set.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1Set.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/ASN1Set.java Mon Jun 25 08:02:09 2007
@@ -250,7 +250,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("cannot encode object added to SET");
+ throw new IllegalArgumentException("cannot encode object added to SET", e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/BERConstructedOctetString.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/BERConstructedOctetString.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/BERConstructedOctetString.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/BERConstructedOctetString.java Mon Jun 25 08:02:09 2007
@@ -43,11 +43,11 @@
}
catch (ClassCastException e)
{
- throw new IllegalArgumentException(octs.elementAt(i).getClass().getName() + " found in input should only contain DEROctetString");
+ throw new IllegalArgumentException(octs.elementAt(i).getClass().getName() + " found in input should only contain DEROctetString", e);
}
catch (IOException e)
{
- throw new IllegalArgumentException("exception converting octets " + e.toString());
+ throw new IllegalArgumentException("exception converting octets " + e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERBitString.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERBitString.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERBitString.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERBitString.java Mon Jun 25 08:02:09 2007
@@ -193,7 +193,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("Error processing object : " + e.toString());
+ throw new IllegalArgumentException("Error processing object : " + e.getMessage(), e);
}
}
@@ -285,7 +285,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("internal error encoding BitString");
+ throw new RuntimeException("internal error encoding BitString", e);
}
byte[] string = bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERUniversalString.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERUniversalString.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERUniversalString.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/DERUniversalString.java Mon Jun 25 08:02:09 2007
@@ -88,7 +88,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("internal error encoding BitString");
+ throw new RuntimeException("internal error encoding BitString", e);
}
byte[] string = bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/pkcs/PrivateKeyInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/pkcs/PrivateKeyInfo.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/pkcs/PrivateKeyInfo.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/pkcs/PrivateKeyInfo.java Mon Jun 25 08:02:09 2007
@@ -95,7 +95,7 @@
}
catch (IOException ex)
{
- throw new IllegalArgumentException("Error recoverying private key from sequence");
+ throw new IllegalArgumentException("Error recoverying private key from sequence", ex);
}
if (e.hasMoreElements())
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/V2TBSCertListGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/V2TBSCertListGenerator.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/V2TBSCertListGenerator.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/V2TBSCertListGenerator.java Mon Jun 25 08:02:09 2007
@@ -143,7 +143,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("error encoding reason: " + e);
+ throw new IllegalArgumentException("error encoding reason: " + e.getMessage(), e);
}
}
@@ -156,7 +156,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("error encoding invalidityDate: " + e);
+ throw new IllegalArgumentException("error encoding invalidityDate: " + e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/X509DefaultEntryConverter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/X509DefaultEntryConverter.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/X509DefaultEntryConverter.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/asn1/x509/X509DefaultEntryConverter.java Mon Jun 25 08:02:09 2007
@@ -53,7 +53,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("can't recode value for oid " + oid.getId());
+ throw new RuntimeException("can't recode value for oid " + oid.getId(), e);
}
}
else if (oid.equals(X509Name.EmailAddress))
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Base64.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Base64.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Base64.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Base64.java Mon Jun 25 08:02:09 2007
@@ -41,7 +41,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("exception encoding base64 string: " + e);
+ throw new RuntimeException("exception encoding base64 string: " + e.getMessage(), e);
}
return bOut.toByteArray();
@@ -91,7 +91,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("exception decoding base64 string: " + e);
+ throw new RuntimeException("exception decoding base64 string: " + e.getMessage(), e);
}
return bOut.toByteArray();
@@ -113,7 +113,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("exception decoding base64 string: " + e);
+ throw new RuntimeException("exception decoding base64 string: " + e.getMessage(), e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Hex.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Hex.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Hex.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/Hex.java Mon Jun 25 08:02:09 2007
@@ -54,7 +54,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("exception encoding Hex string: " + e);
+ throw new RuntimeException("exception encoding Hex string: " + e.getMessage(), e);
}
return bOut.toByteArray();
@@ -104,7 +104,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("exception decoding Hex string: " + e);
+ throw new RuntimeException("exception decoding Hex string: " + e.getMessage(), e);
}
return bOut.toByteArray();
@@ -126,7 +126,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("exception decoding Hex string: " + e);
+ throw new RuntimeException("exception decoding Hex string: " + e.getMessage(), e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/UrlBase64.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/UrlBase64.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/UrlBase64.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/encoders/UrlBase64.java Mon Jun 25 08:02:09 2007
@@ -53,7 +53,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("exception encoding URL safe base64 string: " + e);
+ throw new RuntimeException("exception encoding URL safe base64 string: " + e.getMessage(), e);
}
return bOut.toByteArray();
@@ -88,7 +88,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("exception decoding URL safe base64 string: " + e);
+ throw new RuntimeException("exception decoding URL safe base64 string: " + e.getMessage(), e);
}
return bOut.toByteArray();
@@ -124,7 +124,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("exception decoding URL safe base64 string: " + e);
+ throw new RuntimeException("exception decoding URL safe base64 string: " + e.getMessage(), e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/PKCS10CertificationRequest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/PKCS10CertificationRequest.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/PKCS10CertificationRequest.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/PKCS10CertificationRequest.java Mon Jun 25 08:02:09 2007
@@ -132,7 +132,7 @@
}
catch (Exception e)
{
- throw new IllegalArgumentException("badly encoded request");
+ throw new IllegalArgumentException("badly encoded request", e);
}
}
@@ -176,7 +176,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("can't convert name");
+ throw new IllegalArgumentException("can't convert name", e);
}
}
@@ -253,7 +253,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("can't encode public key");
+ throw new IllegalArgumentException("can't encode public key", e);
}
Signature sig = null;
@@ -290,7 +290,7 @@
}
catch (Exception e)
{
- throw new SecurityException("exception encoding TBS cert request - " + e);
+ throw new SecurityException("exception encoding TBS cert request - " + e.getMessage(), e);
}
this.sigBits = new DERBitString(sig.sign());
@@ -339,7 +339,7 @@
}
catch (InvalidKeySpecException e)
{
- throw new InvalidKeyException("error decoding public key");
+ throw (InvalidKeyException)new InvalidKeyException("error decoding public key").initCause(e);
}
}
@@ -400,7 +400,7 @@
}
catch (Exception e)
{
- throw new SecurityException("exception encoding TBS cert request - " + e);
+ throw (SecurityException)new SecurityException("exception encoding TBS cert request - " + e.getMessage()).initCause(e);
}
return sig.verify(sigBits.getBytes());
@@ -420,7 +420,7 @@
}
catch (IOException e)
{
- throw new RuntimeException(e.toString());
+ throw new RuntimeException(e.getMessage(), e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509Principal.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509Principal.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509Principal.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509Principal.java Mon Jun 25 08:02:09 2007
@@ -147,7 +147,7 @@
}
catch (IOException e)
{
- throw new RuntimeException(e.toString());
+ throw new RuntimeException(e.getMessage(), e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509V1CertificateGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509V1CertificateGenerator.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509V1CertificateGenerator.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/X509V1CertificateGenerator.java Mon Jun 25 08:02:09 2007
@@ -143,7 +143,7 @@
}
catch (Exception e)
{
- throw new IllegalArgumentException("unable to process key - " + e.toString());
+ throw new IllegalArgumentException("unable to process key - " + e.getMessage(), e);
}
}
@@ -178,7 +178,7 @@
}
catch (NoSuchProviderException e)
{
- throw new SecurityException("JCE provider not installed!");
+ throw (SecurityException)new SecurityException("JCE provider not installed!").initCause(e);
}
}
@@ -197,7 +197,7 @@
}
catch (NoSuchProviderException e)
{
- throw new SecurityException("JCE provider not installed!");
+ throw (SecurityException)new SecurityException("JCE provider not installed!").initCause(e);
}
}
@@ -249,7 +249,7 @@
}
catch (NoSuchAlgorithmException e)
{
- throw new SecurityException("exception creating signature: " + e.toString());
+ throw (SecurityException)new SecurityException("exception creating signature: " + e.getMessage()).initCause(e);
}
}
@@ -275,7 +275,7 @@
}
catch (Exception e)
{
- throw new SecurityException("exception encoding TBS cert - " + e);
+ throw (SecurityException)new SecurityException("exception encoding TBS cert - " + e.getMessage()).initCause(e);
}
ASN1EncodableVector v = new ASN1EncodableVector();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPrivateKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPrivateKey.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPrivateKey.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPrivateKey.java Mon Jun 25 08:02:09 2007
@@ -128,7 +128,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("Error encoding DH private key");
+ throw new RuntimeException("Error encoding DH private key", e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPublicKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPublicKey.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPublicKey.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCEDHPublicKey.java Mon Jun 25 08:02:09 2007
@@ -83,7 +83,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("invalid info structure in DH public key");
+ throw new IllegalArgumentException("invalid info structure in DH public key", e);
}
this.y = derY.getValue();
@@ -120,7 +120,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("Error encoding DH public key");
+ throw new RuntimeException("Error encoding DH public key", e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPrivateCrtKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPrivateCrtKey.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPrivateCrtKey.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPrivateCrtKey.java Mon Jun 25 08:02:09 2007
@@ -154,7 +154,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("Error encoding RSA public key");
+ throw new RuntimeException("Error encoding RSA public key", e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPublicKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPublicKey.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPublicKey.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JCERSAPublicKey.java Mon Jun 25 08:02:09 2007
@@ -71,7 +71,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("invalid info structure in RSA public key");
+ throw new IllegalArgumentException("invalid info structure in RSA public key", e);
}
}
@@ -118,7 +118,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("Error encoding RSA public key");
+ throw new RuntimeException("Error encoding RSA public key", e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPrivateKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPrivateKey.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPrivateKey.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPrivateKey.java Mon Jun 25 08:02:09 2007
@@ -118,7 +118,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("Error encoding DSA private key");
+ throw new RuntimeException("Error encoding DSA private key", e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPublicKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPublicKey.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPublicKey.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKDSAPublicKey.java Mon Jun 25 08:02:09 2007
@@ -81,7 +81,7 @@
}
catch (IOException e)
{
- throw new IllegalArgumentException("invalid info structure in DSA public key");
+ throw new IllegalArgumentException("invalid info structure in DSA public key", e);
}
this.y = derY.getValue();
@@ -111,7 +111,7 @@
}
catch (IOException e)
{
- throw new RuntimeException("Error encoding DSA public key");
+ throw new RuntimeException("Error encoding DSA public key", e);
}
return bOut.toByteArray();
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKKeyFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKKeyFactory.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKKeyFactory.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/JDKKeyFactory.java Mon Jun 25 08:02:09 2007
@@ -267,7 +267,7 @@
}
catch (Exception ex)
{
- throw new InvalidKeySpecException(ex.toString());
+ throw (InvalidKeySpecException)new InvalidKeySpecException(ex.getMessage()).initCause(ex);
}
}
}
@@ -296,7 +296,7 @@
}
catch (Exception e)
{
- throw new InvalidKeySpecException(e.toString());
+ throw (InvalidKeySpecException)new InvalidKeySpecException(e.getMessage()).initCause(e);
}
}
else if (keySpec instanceof RSAPublicKeySpec)
@@ -328,7 +328,7 @@
}
catch (Exception e)
{
- throw new InvalidKeySpecException(e.toString());
+ throw (InvalidKeySpecException)new InvalidKeySpecException(e.getMessage()).initCause(e);
}
}
else if (keySpec instanceof DHPrivateKeySpec)
@@ -352,7 +352,7 @@
}
catch (Exception e)
{
- throw new InvalidKeySpecException(e.toString());
+ throw (InvalidKeySpecException)new InvalidKeySpecException(e.getMessage()).initCause(e);
}
}
else if (keySpec instanceof DHPublicKeySpec)
@@ -384,7 +384,7 @@
}
catch (Exception e)
{
- throw new InvalidKeySpecException(e.toString());
+ throw (InvalidKeySpecException)new InvalidKeySpecException(e.getMessage()).initCause(e);
}
}
else if (keySpec instanceof DSAPrivateKeySpec)
@@ -408,7 +408,7 @@
}
catch (Exception e)
{
- throw new InvalidKeySpecException(e.toString());
+ throw (InvalidKeySpecException)new InvalidKeySpecException(e.getMessage()).initCause(e);
}
}
else if (keySpec instanceof DSAPublicKeySpec)
@@ -450,7 +450,7 @@
}
catch (Exception e)
{
- throw new InvalidKeySpecException(e.toString());
+ throw (InvalidKeySpecException)new InvalidKeySpecException(e.getMessage()).initCause(e);
}
}
@@ -470,7 +470,7 @@
}
catch (Exception e)
{
- throw new InvalidKeySpecException(e.toString());
+ throw (InvalidKeySpecException)new InvalidKeySpecException(e.getMessage()).initCause(e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLEntryObject.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLEntryObject.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLEntryObject.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLEntryObject.java Mon Jun 25 08:02:09 2007
@@ -119,7 +119,7 @@
}
catch (Exception e)
{
- throw new RuntimeException("error encoding " + e.toString());
+ throw new RuntimeException("error encoding " + e.getMessage(), e);
}
}
}
@@ -141,7 +141,7 @@
}
catch (IOException e)
{
- throw new CRLException(e.toString());
+ throw (CRLException)new CRLException(e.getMessage()).initCause(e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLObject.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLObject.java?view=diff&rev=550523&r1=550522&r2=550523
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLObject.java (original)
+++ geronimo/server/trunk/modules/geronimo-util/src/main/java/org/apache/geronimo/util/jce/provider/X509CRLObject.java Mon Jun 25 08:02:09 2007
@@ -141,7 +141,7 @@
}
catch (Exception e)
{
- throw new RuntimeException("error encoding " + e.toString());
+ throw new RuntimeException("error encoding " + e.getMessage(), e);
}
}
}
@@ -163,7 +163,7 @@
}
catch (IOException e)
{
- throw new CRLException(e.toString());
+ throw (CRLException)new CRLException(e.getMessage()).initCause(e);
}
}
@@ -218,7 +218,7 @@
}
catch (IOException e)
{
- throw new IllegalStateException("can't encode issuer DN");
+ throw new IllegalStateException("can't encode issuer DN", e);
}
}
@@ -287,7 +287,7 @@
}
catch (IOException e)
{
- throw new CRLException(e.toString());
+ throw (CRLException)new CRLException(e.getMessage()).initCause(e);
}
}
@@ -334,7 +334,7 @@
}
catch (Exception e)
{
- throw new RuntimeException("exception getting sig parameters " + e);
+ throw new RuntimeException("exception getting sig parameters " + e.getMessage(), e);
}
return bOut.toByteArray();