Author: bago
Date: Thu Mar 31 09:55:40 2011
New Revision: 1087231
URL: http://svn.apache.org/viewvc?rev=1087231&view=rev
Log:
Remove mime4j imports from DKIMSigner/DKIMVerifier so users of the DKIM mailets
do not need mime4j in their classpath (mainly to reduce issues with mismatching
mime4j versions inside james).
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java?rev=1087231&r1=1087230&r2=1087231&view=diff
==============================================================================
--- james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java
(original)
+++ james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java
Thu Mar 31 09:55:40 2011
@@ -40,7 +40,6 @@ import org.apache.james.jdkim.exceptions
import org.apache.james.jdkim.impl.BodyHasherImpl;
import org.apache.james.jdkim.impl.Message;
import org.apache.james.jdkim.tagvalue.SignatureRecordImpl;
-import org.apache.james.mime4j.MimeException;
public class DKIMSigner extends DKIMCommon {
@@ -66,23 +65,29 @@ public class DKIMSigner extends DKIMComm
try {
try {
message = new Message(is);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (IOException e) {
+ throw e;
+ } catch (Exception e1) {
+ // This can only be a MimeException but we don't declare to
allow usage of
+ // DKIMSigner without Mime4J dependency.
+ throw new PermFailException("MIME parsing exception: "
+ + e1.getMessage(), e1);
+ }
- try {
- SignatureRecord srt =
newSignatureRecordTemplate(signatureRecordTemplate);
+ try {
+ SignatureRecord srt =
newSignatureRecordTemplate(signatureRecordTemplate);
- BodyHasher bhj = newBodyHasher(srt);
+ BodyHasher bhj = newBodyHasher(srt);
- // computation of the body hash.
- DKIMCommon.streamCopy(message.getBodyInputStream(), bhj
- .getOutputStream());
-
- return sign(message, bhj);
- } finally {
- message.dispose();
- }
- } catch (MimeException e1) {
- throw new PermFailException("MIME parsing exception: "
- + e1.getMessage(), e1);
+ // computation of the body hash.
+ DKIMCommon.streamCopy(message.getBodyInputStream(), bhj
+ .getOutputStream());
+
+ return sign(message, bhj);
+ } finally {
+ message.dispose();
}
} finally {
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java?rev=1087231&r1=1087230&r2=1087231&view=diff
==============================================================================
---
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java
(original)
+++
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java
Thu Mar 31 09:55:40 2011
@@ -49,7 +49,6 @@ import org.apache.james.jdkim.impl.Messa
import org.apache.james.jdkim.impl.MultiplexingPublicKeyRecordRetriever;
import org.apache.james.jdkim.tagvalue.PublicKeyRecordImpl;
import org.apache.james.jdkim.tagvalue.SignatureRecordImpl;
-import org.apache.james.mime4j.MimeException;
public class DKIMVerifier extends DKIMCommon {
@@ -212,15 +211,23 @@ public class DKIMVerifier extends DKIMCo
FailException {
Message message;
try {
- message = new Message(is);
- try {
- return verify(message, message.getBodyInputStream());
- } finally {
- message.dispose();
- }
- } catch (MimeException e1) {
- throw new PermFailException("Mime parsing exception: "
- + e1.getMessage(), e1);
+ try {
+ message = new Message(is);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (IOException e) {
+ throw e;
+ } catch (Exception e1) {
+ // This can only be a MimeException but we don't declare to
allow usage of
+ // DKIMSigner without Mime4J dependency.
+ throw new PermFailException("Mime parsing exception: "
+ + e1.getMessage(), e1);
+ }
+ try {
+ return verify(message, message.getBodyInputStream());
+ } finally {
+ message.dispose();
+ }
} finally {
is.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
