@@ -39,7 +39,7 @@
<!-- prefixed with "env". -->
<property environment="env"/>
- <property name="version" value="1.2.15"/>
+ <property name="version" value="1.2.15-ssl-patch"/>
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
@@ -595,9 +595,13 @@
<!-- Build the site files using Maven -->
<!-- ============================================== -->
<target name="site">
- <exec executable="mvn">
+ <exec executable="mvn" osfamily="unix">
<arg value="site"/>
</exec>
+
+ <exec executable="cmd" osfamily="windows">
+ <arg value="/c mvn site"/>
+ </exec>
</target>
build.xml
@@ -383,6 +383,11 @@
<url>https://maven-repository.dev.java.net/nonav/repository</url>
<layout>legacy</layout>
</repository>
+ <repository>
+ <id>java.net-official</id>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
</repositories>
<dependencies>
<dependency>
pom.xml
@@ -20,7 +20,10 @@
<title>Apache log4j 1.2</title>
</properties>
<body>
-
+ <release version="1.2.15-ssl-patch" date="2009-03-05" description="Support SSL transport in SMTPAppender for gmail support.">
+ <action action="fix" issue="25355">Support SSL transport in SMTPAppender</action>
+ <release>
+
<release version="1.2.15" date="2007-08-24" description="SyslogAppender enhancements, NTEventLogAppender and Maven build.">
<action issue="40951">log4j 1.2.15 release preparation.</action>
<action action="add" issue="40212">Switch to NOPLoggerRepository if application reloading nulls repositorySelector.</action>
src/changes/changes.xml
@@ -83,6 +83,9 @@ public class SMTPAppender extends AppenderSkeleton
private String smtpHost;
private String smtpUsername;
private String smtpPassword;
+ private String smtpProtocol;
+ private int smtpPort = -1;
+ private String startTls;
private boolean smtpDebug = false;
private int bufferSize = 512;
private boolean locationInfo = false;
@@ -173,13 +176,28 @@ public class SMTPAppender extends AppenderSkeleton
} catch(SecurityException ex) {
props = new Properties();
}
+
+ String prefix = "mail.smtp";
+ if (smtpProtocol != null) {
+ props.put("mail.transport.protocol", smtpProtocol);
+ prefix = "mail." + smtpProtocol;
+ }
+
if (smtpHost != null) {
- props.put("mail.smtp.host", smtpHost);
+ props.put(prefix + ".host", smtpHost);
+ }
+
+ if (smtpPort > 0) {
+ props.put(prefix + ".port", String.valueOf(smtpPort));
+ }
+
+ if (startTls != null) {
+ props.put("mail.smtp.starttls.enable", startTls);
}
Authenticator auth = null;
if(smtpPassword != null && smtpUsername != null) {
- props.put("mail.smtp.auth", "true");
+ props.put(prefix + ".auth", "true");
auth = new Authenticator() {
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(smtpUsername, smtpPassword);
@@ -187,12 +205,78 @@ public class SMTPAppender extends AppenderSkeleton
};
}
Session session = Session.getInstance(props, auth);
+ if (smtpProtocol != null) {
+ session.setProtocolForAddress("rfc822", smtpProtocol);
+ }
if (smtpDebug) {
session.setDebug(smtpDebug);
}
return session;
}
+ /**
+ * Get transport protocol.
+ * Typically null or "smtps".
+ *
+ * @return transport protocol, may be null.
+ * @since 1.2.16
+ */
+ public final String getSMTPProtocol() {
+ return smtpProtocol;
+ }
+
+ /**
+ * Set transport protocol.
+ * Typically null or "smtps".
+ *
+ * @param val transport protocol, may be null.
+ * @since 1.2.16
+ */
+ public final void setSMTPProtocol(final String val) {
+ smtpProtocol = val;
+ }
+
+ /**
+ * Get port.
+ *
+ * @return port, negative values indicate use of default ports for protocol.
+ * @since 1.2.16
+ */
+ public final int getSMTPPort() {
+ return smtpPort;
+ }
+
+ /**
+ * Set startTls.
+ * Typically true/false.
+ *
+ * @since 1.2.15-gmail-patch
+ */
+ public final void setStartTls(final String val) {
+ startTls = val;
+ }
+
+ /**
+ * Get startTls.
+ *
+ * @return true/false/null
+ * @since 1.2.15-gmail-patch
+ */
+ public final String getStartTls() {
+ return startTls;
+ }
+
+ /**
+ * Set port.
+ *
+ * @param val port, negative values indicate use of default ports for protocol.
+ * @since 1.2.16
+ */
+ public final void setSMTPPort(final int val) {
+ smtpPort = val;
+ }
+
+
/**
Perform SMTPAppender specific appending actions, mainly adding
the event to a cyclic buffer and checking if the event triggers
src/main/java/org/apache/log4j/net/SMTPAppender.java
d26ede728279d763abb05ae3ab9ed78450fb38e6
francisoud
pub.cog@gmail.com
http://github.com/francisoud/log4j-1.2.15-ssl-patch/commit/32a602604f4d4eb12a471d8e97796156a423b4d3
32a602604f4d4eb12a471d8e97796156a423b4d3
2009-03-20T01:57:29-07:00
2009-03-20T01:57:29-07:00
patching log4j file to add gmail support
0fc5956e5470f63b1e1ed1992e1a4ab51d2693cd
francisoud
pub.cog@gmail.com