JAMES-1688 convert tab to spaces
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e5f6c5f8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e5f6c5f8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e5f6c5f8 Branch: refs/heads/master Commit: e5f6c5f89f3cc9003bed06731ae8c8fb3c2553eb Parents: e91dd50 Author: Matthieu Baechler <matthieu.baech...@gmail.com> Authored: Fri Feb 19 10:54:09 2016 +0100 Committer: Matthieu Baechler <matthieu.baech...@gmail.com> Committed: Fri Feb 19 11:51:25 2016 +0100 ---------------------------------------------------------------------- .../james/transport/mailets/HeadersToHTTP.java | 278 +++++++++--------- .../transport/mailets/SerialiseToHTTP.java | 292 +++++++++---------- 2 files changed, 285 insertions(+), 285 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/e5f6c5f8/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java index 1297a9a..4c46eb2 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java @@ -54,148 +54,148 @@ import java.util.HashSet; */ public class HeadersToHTTP extends GenericMailet { - /** - * The name of the header to be added. - */ - private String url; - private String parameterKey = null; - private String parameterValue = null; - private boolean passThrough = true; - - /** - * Initialize the mailet. - */ - public void init() throws MessagingException { - - passThrough = (getInitParameter("passThrough", "true").compareToIgnoreCase("true") == 0); - String targetUrl = getInitParameter("url"); - parameterKey = getInitParameter("parameterKey"); - parameterValue = getInitParameter("parameterValue"); - - // Check if needed config values are used - if (targetUrl == null || targetUrl.equals("")) { - throw new MessagingException("Please configure a targetUrl (\"url\")"); - } else { - try { - // targetUrl = targetUrl + ( targetUrl.contains("?") ? "&" : - // "?") + parameterKey + "=" + parameterValue; - url = new URL(targetUrl).toExternalForm(); - } catch (MalformedURLException e) { - throw new MessagingException( - "Unable to contruct URL object from url"); - } - } - - // record the result - log("I will attempt to deliver serialised messages to " - + targetUrl - + ". " - + ( ((parameterKey==null) || (parameterKey.length()<1)) ? "I will not add any fields to the post. " : "I will prepend: " + parameterKey + "=" + parameterValue + ". ") - + (passThrough ? "Messages will pass through." : "Messages will be ghosted.")); - } - - /** - * Takes the message, serialises it and sends it to the URL - * - * @param mail - * the mail being processed - * - */ - public void service(Mail mail) { - try { - log(mail.getName() + "HeadersToHTTP: Starting"); - MimeMessage message = mail.getMessage(); - HashSet<NameValuePair> pairs = getNameValuePairs(message); - log(mail.getName() + "HeadersToHTTP: " + pairs.size() + " named value pairs found"); - String result = httpPost(pairs); - if (passThrough) { - addHeader(mail, true, result); - } else { - mail.setState(Mail.GHOST); - } - } catch (javax.mail.MessagingException me) { - log(me.getMessage()); - addHeader(mail, false, me.getMessage()); - } catch (IOException e) { - log(e.getMessage()); - addHeader(mail, false, e.getMessage()); - } - } - - private void addHeader(Mail mail, boolean success, String errorMessage) { - try { - MimeMessage message = mail.getMessage(); - message.setHeader("X-headerToHTTP", (success ? "Succeeded" : "Failed")); - if (!success && errorMessage!=null && errorMessage.length()>0) { - message.setHeader("X-headerToHTTPFailure", errorMessage); - } - message.saveChanges(); - } catch (MessagingException e) { - log(e.getMessage()); - } - } - - private String httpPost(HashSet<NameValuePair> pairs) throws IOException { - - HttpClient client = new DefaultHttpClient(); - HttpPost post = new HttpPost(url); - - post.setParams(extractParams(pairs)); - - HttpResponse clientResponse = client.execute(post); - String result = clientResponse.getStatusLine().getStatusCode() + ": " + clientResponse.getStatusLine(); - log("HeadersToHTTP: " + result); + /** + * The name of the header to be added. + */ + private String url; + private String parameterKey = null; + private String parameterValue = null; + private boolean passThrough = true; + + /** + * Initialize the mailet. + */ + public void init() throws MessagingException { + + passThrough = (getInitParameter("passThrough", "true").compareToIgnoreCase("true") == 0); + String targetUrl = getInitParameter("url"); + parameterKey = getInitParameter("parameterKey"); + parameterValue = getInitParameter("parameterValue"); + + // Check if needed config values are used + if (targetUrl == null || targetUrl.equals("")) { + throw new MessagingException("Please configure a targetUrl (\"url\")"); + } else { + try { + // targetUrl = targetUrl + ( targetUrl.contains("?") ? "&" : + // "?") + parameterKey + "=" + parameterValue; + url = new URL(targetUrl).toExternalForm(); + } catch (MalformedURLException e) { + throw new MessagingException( + "Unable to contruct URL object from url"); + } + } + + // record the result + log("I will attempt to deliver serialised messages to " + + targetUrl + + ". " + + ( ((parameterKey==null) || (parameterKey.length()<1)) ? "I will not add any fields to the post. " : "I will prepend: " + parameterKey + "=" + parameterValue + ". ") + + (passThrough ? "Messages will pass through." : "Messages will be ghosted.")); + } + + /** + * Takes the message, serialises it and sends it to the URL + * + * @param mail + * the mail being processed + * + */ + public void service(Mail mail) { + try { + log(mail.getName() + "HeadersToHTTP: Starting"); + MimeMessage message = mail.getMessage(); + HashSet<NameValuePair> pairs = getNameValuePairs(message); + log(mail.getName() + "HeadersToHTTP: " + pairs.size() + " named value pairs found"); + String result = httpPost(pairs); + if (passThrough) { + addHeader(mail, true, result); + } else { + mail.setState(Mail.GHOST); + } + } catch (javax.mail.MessagingException me) { + log(me.getMessage()); + addHeader(mail, false, me.getMessage()); + } catch (IOException e) { + log(e.getMessage()); + addHeader(mail, false, e.getMessage()); + } + } + + private void addHeader(Mail mail, boolean success, String errorMessage) { + try { + MimeMessage message = mail.getMessage(); + message.setHeader("X-headerToHTTP", (success ? "Succeeded" : "Failed")); + if (!success && errorMessage!=null && errorMessage.length()>0) { + message.setHeader("X-headerToHTTPFailure", errorMessage); + } + message.saveChanges(); + } catch (MessagingException e) { + log(e.getMessage()); + } + } + + private String httpPost(HashSet<NameValuePair> pairs) throws IOException { + + HttpClient client = new DefaultHttpClient(); + HttpPost post = new HttpPost(url); + + post.setParams(extractParams(pairs)); + + HttpResponse clientResponse = client.execute(post); + String result = clientResponse.getStatusLine().getStatusCode() + ": " + clientResponse.getStatusLine(); + log("HeadersToHTTP: " + result); client.getConnectionManager().shutdown(); - return result; - - } - - private HttpParams extractParams(HashSet<NameValuePair> pairs) { - HttpParams params = new BasicHttpParams(); - for(NameValuePair p : pairs) { - params.setParameter(p.getName(),p.getValue()); - } - return params; - } - - private HashSet<NameValuePair> getNameValuePairs(MimeMessage message) throws UnsupportedEncodingException, MessagingException { - - // to_address - // from - // reply to - // subject - - HashSet<NameValuePair> pairs = new HashSet<NameValuePair>(); - - if (message!=null) { - if (message.getSender()!=null) { - pairs.add( new BasicNameValuePair( "from", message.getSender().toString() ) ); - } - if (message.getReplyTo()!=null) { - pairs.add( new BasicNameValuePair( "reply_to", Arrays.toString(message.getReplyTo())) ); - } - if (message.getMessageID()!=null) { - pairs.add( new BasicNameValuePair( "message_id", message.getMessageID() ) ); - } - if (message.getSubject()!=null) { - pairs.add( new BasicNameValuePair( "subject", message.getSubject() ) ); - } - pairs.add( new BasicNameValuePair( "size", Integer.toString(message.getSize()) ) ); - } - - pairs.add( new BasicNameValuePair( parameterKey, parameterValue) ); - - return pairs; + return result; + + } + + private HttpParams extractParams(HashSet<NameValuePair> pairs) { + HttpParams params = new BasicHttpParams(); + for(NameValuePair p : pairs) { + params.setParameter(p.getName(),p.getValue()); + } + return params; } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ - public String getMailetInfo() { - return "HTTP POST serialised message"; - } + private HashSet<NameValuePair> getNameValuePairs(MimeMessage message) throws UnsupportedEncodingException, MessagingException { + + // to_address + // from + // reply to + // subject + + HashSet<NameValuePair> pairs = new HashSet<NameValuePair>(); + + if (message!=null) { + if (message.getSender()!=null) { + pairs.add( new BasicNameValuePair( "from", message.getSender().toString() ) ); + } + if (message.getReplyTo()!=null) { + pairs.add( new BasicNameValuePair( "reply_to", Arrays.toString(message.getReplyTo())) ); + } + if (message.getMessageID()!=null) { + pairs.add( new BasicNameValuePair( "message_id", message.getMessageID() ) ); + } + if (message.getSubject()!=null) { + pairs.add( new BasicNameValuePair( "subject", message.getSubject() ) ); + } + pairs.add( new BasicNameValuePair( "size", Integer.toString(message.getSize()) ) ); + } + + pairs.add( new BasicNameValuePair( parameterKey, parameterValue) ); + + return pairs; + } + + /** + * Return a string describing this mailet. + * + * @return a string describing this mailet + */ + public String getMailetInfo() { + return "HTTP POST serialised message"; + } } http://git-wip-us.apache.org/repos/asf/james-project/blob/e5f6c5f8/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java index 20f9b38..7231686 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java @@ -55,159 +55,159 @@ import java.net.URL; */ public class SerialiseToHTTP extends GenericMailet { - /** - * The name of the header to be added. - */ - private String url; - private String parameterKey = null; - private String parameterValue = null; - private String messageKeyName = "message"; - private boolean passThrough = true; - - /** - * Initialize the mailet. - */ - public void init() throws MessagingException { - - passThrough = (getInitParameter("passThrough", "true").compareToIgnoreCase("true") == 0); - String targetUrl = getInitParameter("url"); - parameterKey = getInitParameter("parameterKey"); - parameterValue = getInitParameter("parameterValue"); - String m = getInitParameter("MessageKeyName"); - if (m != null) { - messageKeyName = m; - } - - // Check if needed config values are used - if (targetUrl == null || targetUrl.equals("")) { - throw new MessagingException( - "Please configure a targetUrl (\"url\")"); - } else { - try { - // targetUrl = targetUrl + ( targetUrl.contains("?") ? "&" : - // "?") + parameterKey + "=" + parameterValue; - url = new URL(targetUrl).toExternalForm(); - } catch (MalformedURLException e) { - throw new MessagingException( - "Unable to contruct URL object from url"); - } - } - - // record the result - log("I will attempt to deliver serialised messages to " - + targetUrl - + " as " - + messageKeyName - + ". " - + (parameterKey==null || parameterKey.length()<2 ? "I will not add any fields to the post. " : "I will prepend: " + parameterKey + "=" + parameterValue + ". ") - + (passThrough ? "Messages will pass through." - : "Messages will be ghosted.")); - } - - /** - * Takes the message, serialises it and sends it to the URL - * - * @param mail - * the mail being processed - * - */ - public void service(Mail mail) { - try { - MimeMessage message = mail.getMessage(); - String serialisedMessage = getSerialisedMessage(message); - NameValuePair[] nameValuePairs = getNameValuePairs(serialisedMessage); - String result = httpPost(nameValuePairs); - if (passThrough) { - addHeader(mail, (result == null || result.length() == 0), result); - } else { - mail.setState(Mail.GHOST); - } - } catch (javax.mail.MessagingException me) { - log(me.getMessage()); - addHeader(mail, false, me.getMessage()); - } catch (IOException e) { - log(e.getMessage()); - addHeader(mail, false, e.getMessage()); - } - } - - private void addHeader(Mail mail, boolean success, String errorMessage) { - try { - MimeMessage message = mail.getMessage(); - message.setHeader("X-toHTTP", (success ? "Succeeded" : "Failed")); - if (!success && errorMessage!=null && errorMessage.length()>0) { - message.setHeader("X-toHTTPFailure", errorMessage); - } - message.saveChanges(); - } catch (MessagingException e) { - log(e.getMessage()); - } - } - - private String getSerialisedMessage(MimeMessage message) - throws IOException, MessagingException { - ByteArrayOutputStream os = new ByteArrayOutputStream(); - message.writeTo(os); - return os.toString(); - } - - private String httpPost(NameValuePair[] data) { + /** + * The name of the header to be added. + */ + private String url; + private String parameterKey = null; + private String parameterValue = null; + private String messageKeyName = "message"; + private boolean passThrough = true; + + /** + * Initialize the mailet. + */ + public void init() throws MessagingException { + + passThrough = (getInitParameter("passThrough", "true").compareToIgnoreCase("true") == 0); + String targetUrl = getInitParameter("url"); + parameterKey = getInitParameter("parameterKey"); + parameterValue = getInitParameter("parameterValue"); + String m = getInitParameter("MessageKeyName"); + if (m != null) { + messageKeyName = m; + } + + // Check if needed config values are used + if (targetUrl == null || targetUrl.equals("")) { + throw new MessagingException( + "Please configure a targetUrl (\"url\")"); + } else { + try { + // targetUrl = targetUrl + ( targetUrl.contains("?") ? "&" : + // "?") + parameterKey + "=" + parameterValue; + url = new URL(targetUrl).toExternalForm(); + } catch (MalformedURLException e) { + throw new MessagingException( + "Unable to contruct URL object from url"); + } + } + + // record the result + log("I will attempt to deliver serialised messages to " + + targetUrl + + " as " + + messageKeyName + + ". " + + (parameterKey==null || parameterKey.length()<2 ? "I will not add any fields to the post. " : "I will prepend: " + parameterKey + "=" + parameterValue + ". ") + + (passThrough ? "Messages will pass through." + : "Messages will be ghosted.")); + } + + /** + * Takes the message, serialises it and sends it to the URL + * + * @param mail + * the mail being processed + * + */ + public void service(Mail mail) { + try { + MimeMessage message = mail.getMessage(); + String serialisedMessage = getSerialisedMessage(message); + NameValuePair[] nameValuePairs = getNameValuePairs(serialisedMessage); + String result = httpPost(nameValuePairs); + if (passThrough) { + addHeader(mail, (result == null || result.length() == 0), result); + } else { + mail.setState(Mail.GHOST); + } + } catch (javax.mail.MessagingException me) { + log(me.getMessage()); + addHeader(mail, false, me.getMessage()); + } catch (IOException e) { + log(e.getMessage()); + addHeader(mail, false, e.getMessage()); + } + } + + private void addHeader(Mail mail, boolean success, String errorMessage) { + try { + MimeMessage message = mail.getMessage(); + message.setHeader("X-toHTTP", (success ? "Succeeded" : "Failed")); + if (!success && errorMessage!=null && errorMessage.length()>0) { + message.setHeader("X-toHTTPFailure", errorMessage); + } + message.saveChanges(); + } catch (MessagingException e) { + log(e.getMessage()); + } + } + + private String getSerialisedMessage(MimeMessage message) + throws IOException, MessagingException { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + message.writeTo(os); + return os.toString(); + } + + private String httpPost(NameValuePair[] data) { String response = null; - HttpClient client = new DefaultHttpClient(); - HttpPost post = new HttpPost(url); + HttpClient client = new DefaultHttpClient(); + HttpPost post = new HttpPost(url); HttpParams params = new BasicHttpParams(); - if( data.length>1 && data[1]!=null ) { + if( data.length>1 && data[1]!=null ) { params.setParameter(data[1].getName(),data[1].getValue()); - log( data[1].getName() + "::" + data[1].getValue() ); - } - post.setParams(params); - - try { - HttpResponse clientResponse = client.execute(post); - - if (clientResponse.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { - log("POST failed: " + clientResponse.getStatusLine()); - response = clientResponse.getStatusLine().toString(); - } - - } catch (ClientProtocolException e) { - log("Fatal protocol violation: " + e.getMessage()); - response = "Fatal protocol violation: " + e.getMessage(); - } catch (IOException e) { - log("Fatal transport error: " + e.getMessage()); - response = "Fatal transport error: " + e.getMessage(); - } finally { - post.releaseConnection(); - } + log( data[1].getName() + "::" + data[1].getValue() ); + } + post.setParams(params); + + try { + HttpResponse clientResponse = client.execute(post); + + if (clientResponse.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { + log("POST failed: " + clientResponse.getStatusLine()); + response = clientResponse.getStatusLine().toString(); + } + + } catch (ClientProtocolException e) { + log("Fatal protocol violation: " + e.getMessage()); + response = "Fatal protocol violation: " + e.getMessage(); + } catch (IOException e) { + log("Fatal transport error: " + e.getMessage()); + response = "Fatal transport error: " + e.getMessage(); + } finally { + post.releaseConnection(); + } client.getConnectionManager().shutdown(); - return response; - } - - private NameValuePair[] getNameValuePairs(String message) throws UnsupportedEncodingException { - - int l = 1; - if (parameterKey!=null && parameterKey.length()>0) { - l = 2; - } - - NameValuePair[] data = new BasicNameValuePair[l]; - data[0] = new BasicNameValuePair( messageKeyName, message); - if (l==2) { - data[1] = new BasicNameValuePair( parameterKey, parameterValue); - } - - return data; + return response; } - /** - * Return a string describing this mailet. - * - * @return a string describing this mailet - */ - public String getMailetInfo() { - return "HTTP POST serialised message"; - } + private NameValuePair[] getNameValuePairs(String message) throws UnsupportedEncodingException { + + int l = 1; + if (parameterKey!=null && parameterKey.length()>0) { + l = 2; + } + + NameValuePair[] data = new BasicNameValuePair[l]; + data[0] = new BasicNameValuePair( messageKeyName, message); + if (l==2) { + data[1] = new BasicNameValuePair( parameterKey, parameterValue); + } + + return data; + } + + /** + * Return a string describing this mailet. + * + * @return a string describing this mailet + */ + public String getMailetInfo() { + return "HTTP POST serialised message"; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
