Author: tchemit Date: 2012-07-12 19:03:55 +0200 (Thu, 12 Jul 2012) New Revision: 846 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/846 Log: add svn properties + fix headers + fix api 1.6 Modified: trunk/src/main/java/org/nuiton/io/mail/ProjectJavamailMailSender.java trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java Modified: trunk/src/main/java/org/nuiton/io/mail/ProjectJavamailMailSender.java =================================================================== --- trunk/src/main/java/org/nuiton/io/mail/ProjectJavamailMailSender.java 2012-07-12 16:55:57 UTC (rev 845) +++ trunk/src/main/java/org/nuiton/io/mail/ProjectJavamailMailSender.java 2012-07-12 17:03:55 UTC (rev 846) @@ -25,10 +25,11 @@ package org.nuiton.io.mail; -import java.security.Security; -import java.util.Date; -import java.util.Iterator; -import java.util.Properties; +import org.codehaus.plexus.mailsender.AbstractMailSender; +import org.codehaus.plexus.mailsender.MailMessage; +import org.codehaus.plexus.mailsender.MailSenderException; +import org.codehaus.plexus.mailsender.util.DateFormatUtils; +import org.codehaus.plexus.util.StringUtils; import javax.mail.Authenticator; import javax.mail.Message; @@ -38,20 +39,18 @@ import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import java.security.Provider; +import java.security.Security; +import java.util.Date; +import java.util.Iterator; +import java.util.Properties; -import com.sun.net.ssl.internal.ssl.Provider; -import org.codehaus.plexus.mailsender.AbstractMailSender; -import org.codehaus.plexus.mailsender.MailMessage; -import org.codehaus.plexus.mailsender.MailSenderException; -import org.codehaus.plexus.mailsender.util.DateFormatUtils; -import org.codehaus.plexus.util.StringUtils; - /** * Helper class for sending email. - * + * <p/> * Note : this code was stolen in {@code maven-changes-plugin}, should thanks * them... - * + * * @author tchemit <chemit@codelutin.com> * @since 1.0.3 */ @@ -59,10 +58,12 @@ extends AbstractMailSender { private static final String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory"; + // ---------------------------------------------------------------------- // // ---------------------------------------------------------------------- private Properties userProperties; + private Properties props; // ---------------------------------------------------------------------- @@ -90,7 +91,7 @@ props.put("mail.debug", String.valueOf(getLogger().isDebugEnabled())); if (isSslMode()) { - Security.addProvider(new Provider()); + Security.addProvider(getSsllProvider()); props.put("mail.smtp.socketFactory.port", String.valueOf(getSmtpPort())); @@ -100,7 +101,7 @@ } if (userProperties != null) { - for (Iterator<?> i = userProperties.keySet().iterator(); i.hasNext();) { + for (Iterator<?> i = userProperties.keySet().iterator(); i.hasNext(); ) { String key = (String) i.next(); String value = userProperties.getProperty(key); @@ -110,6 +111,17 @@ } } + private Provider getSsllProvider() { + try { + Class<?> aClass = + Class.forName("com.sun.net.ssl.internal.ssl.Provider"); + return (Provider) aClass.newInstance(); + } catch (Exception e) { + + throw new IllegalStateException("Could not obtain ssl provider", e); + } + } + // ---------------------------------------------------------------------- // MailSender Implementation // ---------------------------------------------------------------------- @@ -142,7 +154,7 @@ if (mail.getToAddresses().size() > 0) { InternetAddress[] addressTo = new InternetAddress[mail.getToAddresses().size()]; int count = 0; - for (Iterator<?> i = mail.getToAddresses().iterator(); i.hasNext();) { + for (Iterator<?> i = mail.getToAddresses().iterator(); i.hasNext(); ) { String address = ((MailMessage.Address) i.next()).getRfc2822Address(); addressTo[count++] = new InternetAddress(address); } @@ -152,7 +164,7 @@ if (mail.getCcAddresses().size() > 0) { InternetAddress[] addressCc = new InternetAddress[mail.getCcAddresses().size()]; int count = 0; - for (Iterator<?> i = mail.getCcAddresses().iterator(); i.hasNext();) { + for (Iterator<?> i = mail.getCcAddresses().iterator(); i.hasNext(); ) { String address = ((MailMessage.Address) i.next()).getRfc2822Address(); addressCc[count++] = new InternetAddress(address); } @@ -162,7 +174,7 @@ if (mail.getBccAddresses().size() > 0) { InternetAddress[] addressBcc = new InternetAddress[mail.getBccAddresses().size()]; int count = 0; - for (Iterator<?> i = mail.getBccAddresses().iterator(); i.hasNext();) { + for (Iterator<?> i = mail.getBccAddresses().iterator(); i.hasNext(); ) { String address = ((MailMessage.Address) i.next()).getRfc2822Address(); addressBcc[count++] = new InternetAddress(address); } Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-12 16:55:57 UTC (rev 845) +++ trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-12 17:03:55 UTC (rev 846) @@ -1,4 +1,27 @@ package org.nuiton.io.rest; +/* + * #%L + * Helper Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ import com.google.common.collect.Maps; Property changes on: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-12 16:55:57 UTC (rev 845) +++ trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-12 17:03:55 UTC (rev 846) @@ -1,4 +1,27 @@ package org.nuiton.io.rest; +/* + * #%L + * Helper Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ import java.text.DateFormat; import java.text.SimpleDateFormat; Property changes on: trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native