Index: TECH/Mail/impl/MailAPI.cls.xml
===================================================================
diff -u -r521 -r861
--- TECH/Mail/impl/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 521)
+++ TECH/Mail/impl/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 861)
@@ -3,22 +3,6 @@
 <Class name="TECH.Mail.impl.MailAPI">
 <Super>TECH.Mail.MailAPI,%RegisteredObject</Super>
 
-<Property name="SMTP">
-<Type>%Net.SMTP</Type>
-</Property>
-
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	Set ..SMTP = ##class(%Net.SMTP).%New()
-	Set ..SMTP.smtpserver=..GeefSMTPServer()
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="MaakNieuwMail">
 <ReturnType>TECH.Mail.Mail</ReturnType>
 <Implementation><![CDATA[	Quit ##class(TECH.Mail.impl.Mail).%New()
@@ -36,40 +20,15 @@
 
 <Method name="VerstuurMail">
 <FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
-<Implementation><![CDATA[
-	Set ..SMTP = ##class(%Net.SMTP).%New()
-	Set ..SMTP.smtpserver=..GeefSMTPServer()
-	
-	#dim Status As %Status = ..SMTP.Send(Mail.GeefMailMessage())
-	
-	If $$$ISERR(Status)
-	{
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon geen mail versturen",Status))
-	}
-	Quit
+<Implementation><![CDATA[	Do ..GeefVerzender().Verzend(Mail)
 ]]></Implementation>
 </Method>
 
-<Method name="ZetAuthenticatie">
-<FormalSpec>Gebruikersnaam:%String,Wachtwoord:%String</FormalSpec>
-<Implementation><![CDATA[
-	set ..SMTP.authenticator = ##class(%Net.Authenticator).%New()
-	set ..SMTP.authenticator.UserName = Gebruikersnaam 
-	set ..SMTP.authenticator.Password = Wachtwoord
+<Method name="GeefVerzender">
+<ReturnType>TECH.Mail.Verzender</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.Mail.impl.SMTPVerzender).%New()
 ]]></Implementation>
 </Method>
-
-<Method name="WisAuthenticatie">
-<Implementation><![CDATA[	set ..SMTP.authenticator = ""
-]]></Implementation>
-</Method>
-
-<Method name="GeefSMTPServer">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ##class(TECH.Config.ConfigMgr).Instance().GetString("MiniMail_SMTPServerNameOrIP")
-]]></Implementation>
-</Method>
 </Class>