Menu
▾
▴
[jtrac-svn] SF.net SVN: j-trac:[1349] trunk/jtrac
|
From: <man...@us...> - 2010-05-11 14:07:01
|
Revision: 1349
http://j-trac.svn.sourceforge.net/j-trac/?rev=1349&view=rev
Author: manfredwolff
Date: 2010-05-11 14:06:52 +0000 (Tue, 11 May 2010)
Log Message:
-----------
Fixing #2974643 (new option for mail.smtp.localhost) including the message files (default, English, German). Also updating the documentation with some releasenotes for 2.2.0 and the new setting screen.
Modified Paths:
--------------
trunk/jtrac/doc/src/images/settings.png
trunk/jtrac/doc/src/index.xml
trunk/jtrac/src/main/java/info/jtrac/domain/Config.java
trunk/jtrac/src/main/java/info/jtrac/mail/MailSender.java
trunk/jtrac/src/main/resources/messages.properties
trunk/jtrac/src/main/resources/messages_de.properties
trunk/jtrac/src/main/resources/messages_en.properties
Modified: trunk/jtrac/doc/src/images/settings.png
===================================================================
(Binary files differ)
Modified: trunk/jtrac/doc/src/index.xml
===================================================================
--- trunk/jtrac/doc/src/index.xml 2010-05-11 11:51:04 UTC (rev 1348)
+++ trunk/jtrac/doc/src/index.xml 2010-05-11 14:06:52 UTC (rev 1349)
@@ -11,12 +11,16 @@
<bookinfo>
<title>JTrac</title>
<subtitle>User / Developer Guide</subtitle>
- <releaseinfo>2.1.0</releaseinfo>
+ <releaseinfo>2.2.0</releaseinfo>
<authorgroup>
<author>
<firstname>Peter</firstname>
<surname>Thomas</surname>
</author>
+ <author>
+ <firstname>Manfred</firstname>
+ <surname>Wolff</surname>
+ </author>
</authorgroup>
</bookinfo>
@@ -84,6 +88,30 @@
upgrade.
</para>
</sect1>
+
+ <sect1 id="introduction-releasenotes-2_2">
+ <title>Release Notes: Version 2.2.0</title>
+ <para>
+ There are no database changes between version 2.1.0 and 2.2.0. Instructions on how to upgrade are
+ available in the "<link linkend="upgrading">upgrading</link>" section of this document.
+ </para>
+ <para>
+ There where some minor changes and bugfixes:
+ <itemizedlist>
+ <listitem>
+ <para>It is possible to configure an individual header and an individual logo for your own JTrac.</para>
+ </listitem>
+ <listitem>
+ <para>Errors that were occured because of missing language ressources are fixed.</para>
+ </listitem>
+ <listitem>
+ <para>Some email-issues e.g. sending duplicate mails are fixed.</para>
+ </listitem>
+ </itemizedlist>
+ For details see the <ulink url="https://sourceforge.net/projects/j-trac/">different tracker at
+ the sourceforge website.</ulink>
+ </para>
+ </sect1>
</chapter>
<chapter id="features">
@@ -757,7 +785,16 @@
<para>
JTrac also can lookup and use a JNDI mail session (javax.mail.Session) if required. If you
provide a JNDI name, JTrac will ignore the SMTP server details provided.
- </para>
+ </para>
+
+ <para>
+ JTrac provides also other settings for an individual Headline (jtrac.header.text) and an
+ individual logo on the right side (jtrac.header.text). If no logo is set the original
+ JTrac logo is shown. If the jtrac.edit.item configuration item is set to true people may
+ edit their own items while no change is happens (editable item up to the first history entry).
+ Admins are always able to change the original item text.
+ </para>
+
</sect1>
<sect1 id="installation-war">
<title>Using only the WAR file</title>
Modified: trunk/jtrac/src/main/java/info/jtrac/domain/Config.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/domain/Config.java 2010-05-11 11:51:04 UTC (rev 1348)
+++ trunk/jtrac/src/main/java/info/jtrac/domain/Config.java 2010-05-11 14:06:52 UTC (rev 1349)
@@ -42,6 +42,7 @@
PARAMS.add("mail.server.starttls.enable");
PARAMS.add("mail.subject.prefix");
PARAMS.add("mail.from");
+ PARAMS.add("mail.smtp.localhost");
PARAMS.add("mail.session.jndiname");
PARAMS.add("jtrac.url.base");
PARAMS.add("jtrac.header.picture");
Modified: trunk/jtrac/src/main/java/info/jtrac/mail/MailSender.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/mail/MailSender.java 2010-05-11 11:51:04 UTC (rev 1348)
+++ trunk/jtrac/src/main/java/info/jtrac/mail/MailSender.java 2010-05-11 14:06:52 UTC (rev 1349)
@@ -268,7 +268,8 @@
logger.warn("'mail.server.host' config is null, mail sender not initialized");
return;
}
- String port = config.get("mail.server.port");
+ String port = config.get("mail.server.port");
+ String localhost = config.get("mail.smtp.localhost");
from = config.get("mail.from");
prefix = config.get("mail.subject.prefix");
String userName = config.get("mail.server.username");
@@ -289,17 +290,30 @@
sender = new JavaMailSenderImpl();
sender.setHost(host);
sender.setPort(p);
+ Properties props = null;
+
if (userName != null) {
// authentication requested
- Properties props = new Properties();
+ props = new Properties();
props.put("mail.smtp.auth", "true");
if (startTls != null && startTls.toLowerCase().equals("true")) {
props.put("mail.smtp.starttls.enable", "true");
}
- sender.setJavaMailProperties(props);
sender.setUsername(userName);
sender.setPassword(password);
}
+
+ if (localhost != null) {
+ if (props == null) {
+ props = new Properties();
+ }
+ props.put("mail.smtp.localhost", localhost);
+ }
+
+ if (props != null) {
+ sender.setJavaMailProperties(props);
+ }
+
logger.info("email sender initialized from config: host = '" + host + "', port = '" + p + "'");
}
Modified: trunk/jtrac/src/main/resources/messages.properties
===================================================================
--- trunk/jtrac/src/main/resources/messages.properties 2010-05-11 11:51:04 UTC (rev 1348)
+++ trunk/jtrac/src/main/resources/messages.properties 2010-05-11 14:06:52 UTC (rev 1349)
@@ -185,6 +185,7 @@
config.mail.subject.prefix = Text that will be prefixed to the e-mail subject-line (default [jtrac])
config.mail.session.jndiname = javax.mail.Session JNDI name - if present, this will be used instead of the SMTP server details above
config.mail.from = When generating e-mail, this will be used as the 'from' address
+config.mail.smtp.localhost = Override for the HELO setting of very strict SMPT relays
config.jtrac.url.base = Base URL of your JTrac installation ( e.g. http://myserver/jtrac ) required for links in the e-mails to work
config.jtrac.header.picture = Individual header picture
config.jtrac.header.text = Individual header text
Modified: trunk/jtrac/src/main/resources/messages_de.properties
===================================================================
--- trunk/jtrac/src/main/resources/messages_de.properties 2010-05-11 11:51:04 UTC (rev 1348)
+++ trunk/jtrac/src/main/resources/messages_de.properties 2010-05-11 14:06:52 UTC (rev 1349)
@@ -184,6 +184,7 @@
config.mail.subject.prefix = Text der dem eMail Betreff vorangestellt wird (Default [jtrac])
config.mail.session.jndiname = javax.mail.Session JNDI Name - Wenn vorhanden wird diese Verbindung statt dem SMTP Server benutzt
config.mail.from = Wir in eMails als Absenderadresse gesetzt
+config.mail.smtp.localhost = \xDCberladen der HELO Settings f\xFCr sehr strikte SMPT Server
config.jtrac.url.base = URL dieser Installation ( zB. http://myserver/jtrac ) wird ben\u00F6tigt f\u00FCr Links in den eMails
config.jtrac.header.picture = Inidividuelles Bild
config.jtrac.header.text = Individueller Text
Modified: trunk/jtrac/src/main/resources/messages_en.properties
===================================================================
--- trunk/jtrac/src/main/resources/messages_en.properties 2010-05-11 11:51:04 UTC (rev 1348)
+++ trunk/jtrac/src/main/resources/messages_en.properties 2010-05-11 14:06:52 UTC (rev 1349)
@@ -185,6 +185,7 @@
config.mail.subject.prefix = Text that will be prefixed to the e-mail subject-line (default [jtrac])
config.mail.session.jndiname = javax.mail.Session JNDI name - if present, this will be used instead of the SMTP server details above
config.mail.from = When generating e-mail, this will be used as the 'from' address
+config.mail.smtp.localhost = Override for the HELO setting of very strict SMPT relays
config.jtrac.url.base = Base URL of your JTrac installation ( e.g. http://myserver/jtrac ) required for links in the e-mails to work
config.jtrac.header.picture = Individual header picture
config.jtrac.header.text = Individual header text
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
