Attached Files | email_ssl_config.diff [^] (17,016 bytes) 2011-01-26 16:46 [Show Content] [Hide Content]diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -265651,6 +265651,37 @@
<!--2A3CDBEEACD94932B217E45E20040B63--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--2A3CDBEEACD94932B217E45E20040B63--></AD_COLUMN>
+<!--2AFA0BE438424C6881A0A52781FF304E--><AD_COLUMN>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <AD_COLUMN_ID><![CDATA[2AFA0BE438424C6881A0A52781FF304E]]></AD_COLUMN_ID>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <NAME><![CDATA[Use SSL]]></NAME>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <COLUMNNAME><![CDATA[Usessl]]></COLUMNNAME>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <AD_TABLE_ID><![CDATA[1000500000]]></AD_TABLE_ID>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <SEQNO><![CDATA[170]]></SEQNO>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <AD_ELEMENT_ID><![CDATA[4796B4D47ACE4CF480DA713D1F261A9A]]></AD_ELEMENT_ID>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2AFA0BE438424C6881A0A52781FF304E--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2AFA0BE438424C6881A0A52781FF304E--></AD_COLUMN>
+
<!--2B5F702BA50F4C2ABB8E14B77F8BE893--><AD_COLUMN>
<!--2B5F702BA50F4C2ABB8E14B77F8BE893--> <AD_COLUMN_ID><![CDATA[2B5F702BA50F4C2ABB8E14B77F8BE893]]></AD_COLUMN_ID>
<!--2B5F702BA50F4C2ABB8E14B77F8BE893--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -294836,6 +294867,36 @@
<!--7ED4235BAC474A13B9059BCE003BCAEF--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--7ED4235BAC474A13B9059BCE003BCAEF--></AD_COLUMN>
+<!--7F93962065E44390A89334F7E82A6B49--><AD_COLUMN>
+<!--7F93962065E44390A89334F7E82A6B49--> <AD_COLUMN_ID><![CDATA[7F93962065E44390A89334F7E82A6B49]]></AD_COLUMN_ID>
+<!--7F93962065E44390A89334F7E82A6B49--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7F93962065E44390A89334F7E82A6B49--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7F93962065E44390A89334F7E82A6B49--> <NAME><![CDATA[SMTP Server Port]]></NAME>
+<!--7F93962065E44390A89334F7E82A6B49--> <COLUMNNAME><![CDATA[Smtpserverport]]></COLUMNNAME>
+<!--7F93962065E44390A89334F7E82A6B49--> <AD_TABLE_ID><![CDATA[1000500000]]></AD_TABLE_ID>
+<!--7F93962065E44390A89334F7E82A6B49--> <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--7F93962065E44390A89334F7E82A6B49--> <FIELDLENGTH><![CDATA[4]]></FIELDLENGTH>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7F93962065E44390A89334F7E82A6B49--> <SEQNO><![CDATA[160]]></SEQNO>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7F93962065E44390A89334F7E82A6B49--> <AD_ELEMENT_ID><![CDATA[C17E4AB475B0408A881DCE757CC0B05B]]></AD_ELEMENT_ID>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7F93962065E44390A89334F7E82A6B49--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7F93962065E44390A89334F7E82A6B49--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7F93962065E44390A89334F7E82A6B49--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7F93962065E44390A89334F7E82A6B49--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7F93962065E44390A89334F7E82A6B49--></AD_COLUMN>
+
<!--7FCA79F6A6804336A083FEE0C8964D6E--><AD_COLUMN>
<!--7FCA79F6A6804336A083FEE0C8964D6E--> <AD_COLUMN_ID><![CDATA[7FCA79F6A6804336A083FEE0C8964D6E]]></AD_COLUMN_ID>
<!--7FCA79F6A6804336A083FEE0C8964D6E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/model/tables/C_POC_CONFIGURATION.xml b/src-db/database/model/tables/C_POC_CONFIGURATION.xml
--- a/src-db/database/model/tables/C_POC_CONFIGURATION.xml
+++ b/src-db/database/model/tables/C_POC_CONFIGURATION.xml
@@ -53,6 +53,14 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="SMTPSERVERPORT" primaryKey="false" required="false" type="DECIMAL" size="8,0" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="USESSL" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="C_POC_CONFIGURATION_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -207551,6 +207551,29 @@
<!--5A174029D43A402E9A72969861E6E27C--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--5A174029D43A402E9A72969861E6E27C--></AD_FIELD>
+<!--5A50004544124E469BE1FB083B32BAE1--><AD_FIELD>
+<!--5A50004544124E469BE1FB083B32BAE1--> <AD_FIELD_ID><![CDATA[5A50004544124E469BE1FB083B32BAE1]]></AD_FIELD_ID>
+<!--5A50004544124E469BE1FB083B32BAE1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5A50004544124E469BE1FB083B32BAE1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5A50004544124E469BE1FB083B32BAE1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5A50004544124E469BE1FB083B32BAE1--> <NAME><![CDATA[SMTP Server Port]]></NAME>
+<!--5A50004544124E469BE1FB083B32BAE1--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5A50004544124E469BE1FB083B32BAE1--> <AD_TAB_ID><![CDATA[1000500000]]></AD_TAB_ID>
+<!--5A50004544124E469BE1FB083B32BAE1--> <AD_COLUMN_ID><![CDATA[7F93962065E44390A89334F7E82A6B49]]></AD_COLUMN_ID>
+<!--5A50004544124E469BE1FB083B32BAE1--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5A50004544124E469BE1FB083B32BAE1--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--5A50004544124E469BE1FB083B32BAE1--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5A50004544124E469BE1FB083B32BAE1--> <SEQNO><![CDATA[90]]></SEQNO>
+<!--5A50004544124E469BE1FB083B32BAE1--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5A50004544124E469BE1FB083B32BAE1--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5A50004544124E469BE1FB083B32BAE1--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5A50004544124E469BE1FB083B32BAE1--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--5A50004544124E469BE1FB083B32BAE1--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5A50004544124E469BE1FB083B32BAE1--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5A50004544124E469BE1FB083B32BAE1--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--5A50004544124E469BE1FB083B32BAE1--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--5A50004544124E469BE1FB083B32BAE1--></AD_FIELD>
+
<!--5A514F7613262417E040007F010049A1--><AD_FIELD>
<!--5A514F7613262417E040007F010049A1--> <AD_FIELD_ID><![CDATA[5A514F7613262417E040007F010049A1]]></AD_FIELD_ID>
<!--5A514F7613262417E040007F010049A1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -224035,6 +224058,29 @@
<!--FC53D4705CB44A4789E7E827341BC584--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--FC53D4705CB44A4789E7E827341BC584--></AD_FIELD>
+<!--FCCD257936504D068A023F6AE84C61EA--><AD_FIELD>
+<!--FCCD257936504D068A023F6AE84C61EA--> <AD_FIELD_ID><![CDATA[FCCD257936504D068A023F6AE84C61EA]]></AD_FIELD_ID>
+<!--FCCD257936504D068A023F6AE84C61EA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FCCD257936504D068A023F6AE84C61EA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FCCD257936504D068A023F6AE84C61EA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FCCD257936504D068A023F6AE84C61EA--> <NAME><![CDATA[Use SSL]]></NAME>
+<!--FCCD257936504D068A023F6AE84C61EA--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FCCD257936504D068A023F6AE84C61EA--> <AD_TAB_ID><![CDATA[1000500000]]></AD_TAB_ID>
+<!--FCCD257936504D068A023F6AE84C61EA--> <AD_COLUMN_ID><![CDATA[2AFA0BE438424C6881A0A52781FF304E]]></AD_COLUMN_ID>
+<!--FCCD257936504D068A023F6AE84C61EA--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--FCCD257936504D068A023F6AE84C61EA--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--FCCD257936504D068A023F6AE84C61EA--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--FCCD257936504D068A023F6AE84C61EA--> <SEQNO><![CDATA[100]]></SEQNO>
+<!--FCCD257936504D068A023F6AE84C61EA--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--FCCD257936504D068A023F6AE84C61EA--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--FCCD257936504D068A023F6AE84C61EA--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FCCD257936504D068A023F6AE84C61EA--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--FCCD257936504D068A023F6AE84C61EA--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--FCCD257936504D068A023F6AE84C61EA--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FCCD257936504D068A023F6AE84C61EA--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--FCCD257936504D068A023F6AE84C61EA--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--FCCD257936504D068A023F6AE84C61EA--></AD_FIELD>
+
<!--FF6017DC061144718EB362D7DE06A614--><AD_FIELD>
<!--FF6017DC061144718EB362D7DE06A614--> <AD_FIELD_ID><![CDATA[FF6017DC061144718EB362D7DE06A614]]></AD_FIELD_ID>
<!--FF6017DC061144718EB362D7DE06A614--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -22313,6 +22313,17 @@
<!--46C995886E534B6BA240599DACD8240B--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--46C995886E534B6BA240599DACD8240B--></AD_ELEMENT>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--><AD_ELEMENT>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--> <AD_ELEMENT_ID><![CDATA[4796B4D47ACE4CF480DA713D1F261A9A]]></AD_ELEMENT_ID>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--> <COLUMNNAME><![CDATA[Usessl]]></COLUMNNAME>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--> <NAME><![CDATA[Use SSL]]></NAME>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--> <PRINTNAME><![CDATA[Use SSL]]></PRINTNAME>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4796B4D47ACE4CF480DA713D1F261A9A--></AD_ELEMENT>
+
<!--4823F0304FFC4CBF84A17244F0431117--><AD_ELEMENT>
<!--4823F0304FFC4CBF84A17244F0431117--> <AD_ELEMENT_ID><![CDATA[4823F0304FFC4CBF84A17244F0431117]]></AD_ELEMENT_ID>
<!--4823F0304FFC4CBF84A17244F0431117--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -27777,6 +27788,17 @@
<!--C0FEDDACE59D4AA59AFB2D1D65D748E0--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--C0FEDDACE59D4AA59AFB2D1D65D748E0--></AD_ELEMENT>
+<!--C17E4AB475B0408A881DCE757CC0B05B--><AD_ELEMENT>
+<!--C17E4AB475B0408A881DCE757CC0B05B--> <AD_ELEMENT_ID><![CDATA[C17E4AB475B0408A881DCE757CC0B05B]]></AD_ELEMENT_ID>
+<!--C17E4AB475B0408A881DCE757CC0B05B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C17E4AB475B0408A881DCE757CC0B05B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C17E4AB475B0408A881DCE757CC0B05B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C17E4AB475B0408A881DCE757CC0B05B--> <COLUMNNAME><![CDATA[Smtpserverport]]></COLUMNNAME>
+<!--C17E4AB475B0408A881DCE757CC0B05B--> <NAME><![CDATA[SMTP Server Port]]></NAME>
+<!--C17E4AB475B0408A881DCE757CC0B05B--> <PRINTNAME><![CDATA[SMTP Server Port]]></PRINTNAME>
+<!--C17E4AB475B0408A881DCE757CC0B05B--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C17E4AB475B0408A881DCE757CC0B05B--></AD_ELEMENT>
+
<!--CB65CBB36988405DA4D2F2C36CD29DC4--><AD_ELEMENT>
<!--CB65CBB36988405DA4D2F2C36CD29DC4--> <AD_ELEMENT_ID><![CDATA[CB65CBB36988405DA4D2F2C36CD29DC4]]></AD_ELEMENT_ID>
<!--CB65CBB36988405DA4D2F2C36CD29DC4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/erpCommon/utility/poc/EmailManager.java b/src/org/openbravo/erpCommon/utility/poc/EmailManager.java
--- a/src/org/openbravo/erpCommon/utility/poc/EmailManager.java
+++ b/src/org/openbravo/erpCommon/utility/poc/EmailManager.java
@@ -62,16 +62,25 @@
log4j.debug("Crm configuration, smtp server account: " + configuration.smtpserveraccount);
if (log4j.isDebugEnabled())
log4j.debug("Crm configuration, smtp server password: " + configuration.smtpserverpassword);
+ log4j.debug("Crm configuration, smtp server port: " + configuration.smtpserverport);
+ log4j.debug("Crm configuration, smtp server ssl: '" + configuration.usessl +"'");
} else {
throw new ServletException("No Poc configuration found for this client.");
}
-
+
Properties props = new Properties();
props.put("mail.debug", "true");
props.put("mail.smtp.auth", (configuration.issmtpauthorization.equals("Y") ? "true" : "false"));
props.put("mail.transport.protocol", "smtp");
+ props.put("mail.host", configuration.smtpserver);
props.put("mail.smtp.mail.sender", "email_admin@openbravo.com");
- props.put("mail.host", configuration.smtpserver);
+ if (configuration.smtpserverport != null && configuration.smtpserverport != "") {
+ props.put("mail.smtp.socketFactory.port", configuration.smtpserverport);
+ }
+ if (configuration.usessl != null && configuration.usessl.equals("Y")) {
+ props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+ props.put("mail.smtp.starttls.enable","true");
+ }
ClientAuthenticator authenticator = null;
if (configuration.smtpserveraccount != null) {
diff --git a/src/org/openbravo/erpCommon/utility/poc/Poc_Configuration_data.xsql b/src/org/openbravo/erpCommon/utility/poc/Poc_Configuration_data.xsql
--- a/src/org/openbravo/erpCommon/utility/poc/Poc_Configuration_data.xsql
+++ b/src/org/openbravo/erpCommon/utility/poc/Poc_Configuration_data.xsql
@@ -35,7 +35,9 @@
'' as smtpServerAccount,
'' as smtpServerPassword,
'' as isSmtpAuthorization,
- '' as smtpServerSenderAddress
+ '' as smtpServerSenderAddress,
+ '' as smtpServerPort,
+ '' as useSsl
from
dual
]]>
@@ -51,7 +53,9 @@
C_poc_configuration.smtpServerAccount,
C_poc_configuration.smtpServerPassword,
C_poc_configuration.isSmtpAuthorization,
- C_poc_configuration.smtpServerSenderAddress
+ C_poc_configuration.smtpServerSenderAddress,
+ C_poc_configuration.smtpServerPort,
+ C_poc_configuration.useSsl
from
C_poc_configuration
where
|