From be635f550aee1757c1b40a156f584b864026fb06 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 20 Aug 2012 12:37:20 -0300 Subject: [PATCH] Heroku email for testing. --- pom.xml | 2 +- wise-webapp/pom.xml | 41 +++++++++---------- .../src/main/webapp/WEB-INF/prod.properties | 24 ++++++++--- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index b9adafd3..d07e5279 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.4 + 2.5 org.jvnet.jaxb2.maven2 diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index a5f7aec0..4efecbbd 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -496,27 +496,26 @@ - - org.apache.maven.plugins - maven-dependency-plugin - 2.3 - - - package - copy - - - - org.mortbay.jetty - jetty-runner - 7.4.5.v20110725 - jetty-runner.jar - - - - - - + + + + + + + + + + + + + + + + + + + + org.jvnet.jaxb2.maven2 diff --git a/wise-webapp/src/main/webapp/WEB-INF/prod.properties b/wise-webapp/src/main/webapp/WEB-INF/prod.properties index 824f7201..875ceec9 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/prod.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/prod.properties @@ -23,14 +23,26 @@ database.password=${DATABASE_PASSWORD} #------------------------ # Plain SMTP Server Configuration #------------------------ -mail.smtp.port=25 -mail.smtp.host=localhost -mail.username=root -mail.password= -mail.smtp.auth=false -mail.smtp.starttls.enable=false +#mail.smtp.port=25 +#mail.smtp.host=localhost +#mail.username=root +#mail.password= +#mail.smtp.auth=false +#mail.smtp.starttls.enable=false +#mail.smtp.quitwait=false + +#------------------------ +# Sendgrid Configuration +#------------------------ +mail.smtp.port=587 +mail.smtp.host=smtp.sendgrid.net +mail.username=app6795136@heroku.com +mail.password=Your Password +mail.smtp.auth=true +mail.smtp.starttls.enable=true mail.smtp.quitwait=false + #------------------------ # SSL SMTP Server Configuration #------------------------