jvanzyl 01/07/24 18:04:06
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
Log:
- adding the ability to set system properties in the following
form:
system.<property> = <value>
properties of this form will be set as follows:
System.getProperties().setProperty(<property>, <value>)
This was specifically added for the changes to the email
classes which need correct System properties to create
a session.
- changed mail.server property to mail.host which is the
proper property name for the mail server according to
the java mail API.
Revision Changes Path
1.126 +23 -25 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- TurbineResources.properties 2001/07/15 18:52:40 1.125
+++ TurbineResources.properties 2001/07/25 01:04:06 1.126
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.125 2001/07/15 18:52:40 mpoeschl Exp $
+# $Id: TurbineResources.properties,v 1.126 2001/07/25 01:04:06 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -10,6 +10,28 @@
# -------------------------------------------------------------------
#
+# S Y S T E M P R O P E R T I E S
+#
+# -------------------------------------------------------------------
+
+# Your mail server for outgoing email.
+#
+# Default: null
+
+system.mail.host=
+
+# SMTP-From header for your outgoing messages
+#
+# All failed delivery messages will be returned to this address.
+# If unset, these messages will be sent to the address in the
+# From header (standard behaviour)
+#
+# Default: null
+
+system.mail.smtp.from=
+
+# -------------------------------------------------------------------
+#
# L O G G I N G
#
# -------------------------------------------------------------------
@@ -45,30 +67,6 @@
log4j.appender.sql.layout = org.apache.log4j.PatternLayout
log4j.appender.sql.layout.conversionPattern = %d [%t] %-5p %c - %m%n
log4j.appender.sql.append = false
-
-# -------------------------------------------------------------------
-#
-# M A I L S E R V E R
-#
-# -------------------------------------------------------------------
-# Your mail server for outgoing email.
-#
-# Default: null
-# -------------------------------------------------------------------
-
-mail.server=
-
-# -------------------------------------------------------------------
-# SMTP-From header for your outgoing messages
-#
-# All failed delivery messages will be returned to this address.
-# If unset, these messages will be sent to the address in the
-# From header (standard behaviour)
-#
-# Default: null
-# -------------------------------------------------------------------
-
-mail.smtp.from=
# -------------------------------------------------------------------
#
1.93 +23 -25 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- TurbineResources.master 2001/07/15 18:52:40 1.92
+++ TurbineResources.master 2001/07/25 01:04:06 1.93
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.92 2001/07/15 18:52:40 mpoeschl Exp $
+# $Id: TurbineResources.master,v 1.93 2001/07/25 01:04:06 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -10,6 +10,28 @@
# -------------------------------------------------------------------
#
+# S Y S T E M P R O P E R T I E S
+#
+# -------------------------------------------------------------------
+
+# Your mail server for outgoing email.
+#
+# Default: null
+
+system.mail.host=@MAIL_SERVER@
+
+# SMTP-From header for your outgoing messages
+#
+# All failed delivery messages will be returned to this address.
+# If unset, these messages will be sent to the address in the
+# From header (standard behaviour)
+#
+# Default: null
+
+system.mail.smtp.from=@MAIL_SMTP_FROM@
+
+# -------------------------------------------------------------------
+#
# L O G G I N G
#
# -------------------------------------------------------------------
@@ -45,30 +67,6 @@
log4j.appender.sql.layout = org.apache.log4j.PatternLayout
log4j.appender.sql.layout.conversionPattern = %d [%t] %-5p %c - %m%n
log4j.appender.sql.append = false
-
-# -------------------------------------------------------------------
-#
-# M A I L S E R V E R
-#
-# -------------------------------------------------------------------
-# Your mail server for outgoing email.
-#
-# Default: null
-# -------------------------------------------------------------------
-
-mail.server=@MAIL_SERVER@
-
-# -------------------------------------------------------------------
-# SMTP-From header for your outgoing messages
-#
-# All failed delivery messages will be returned to this address.
-# If unset, these messages will be sent to the address in the
-# From header (standard behaviour)
-#
-# Default: null
-# -------------------------------------------------------------------
-
-mail.smtp.from=@MAIL_SMTP_FROM@
# -------------------------------------------------------------------
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
