From 81a85aaadf9aa899a7152591b0f62f251c7b78f4 Mon Sep 17 00:00:00 2001 From: Gonzalo Bellver Date: Fri, 17 Aug 2012 12:16:01 -0300 Subject: [PATCH] Deployment on heroku --- Procfile | 1 + branchtest.txt | 2 - branchtest2.txt | 1 - .../src/main/webapp/WEB-INF/prod.properties | 92 +++++++++++++++++++ .../webapp/WEB-INF/wisemapping-security.xml | 6 ++ .../webapp/WEB-INF/wisemapping-servlet.xml | 6 ++ 6 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 Procfile delete mode 100644 branchtest.txt delete mode 100644 branchtest2.txt create mode 100644 wise-webapp/src/main/webapp/WEB-INF/prod.properties diff --git a/Procfile b/Procfile new file mode 100644 index 00000000..63380d37 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: java $JAVA_OPTS -Dspring.profiles.active=production -jar wise-webapp/target/dependency/jetty-runner.jar --port $PORT wise-webapp/target/*.war \ No newline at end of file diff --git a/branchtest.txt b/branchtest.txt deleted file mode 100644 index d6ef8a28..00000000 --- a/branchtest.txt +++ /dev/null @@ -1,2 +0,0 @@ -This is wisemapping. -But we both share the same core. diff --git a/branchtest2.txt b/branchtest2.txt deleted file mode 100644 index 917910c8..00000000 --- a/branchtest2.txt +++ /dev/null @@ -1 +0,0 @@ -This file is shared diff --git a/wise-webapp/src/main/webapp/WEB-INF/prod.properties b/wise-webapp/src/main/webapp/WEB-INF/prod.properties new file mode 100644 index 00000000..824f7201 --- /dev/null +++ b/wise-webapp/src/main/webapp/WEB-INF/prod.properties @@ -0,0 +1,92 @@ +################################################################################## +# Database Configuration +################################################################################## + +# MySQL 5.X configuration properties +database.url=${DATABASE_URL} +database.driver=${DATABASE_DRIVER} +database.hibernate.dialect=${DATABASE_HIBERNATE_DIALECT} +database.username=${DATABASE_USERNAME} +database.password=${DATABASE_PASSWORD} + +# HSQL Configuration properties +#database.url=jdbc:hsqldb:file:target/db/wisemapping +#database.driver=org.hsqldb.jdbc.JDBCDriver +#database.hibernate.dialect=org.hibernate.dialect.HSQLDialect +#database.username=sa +#database.password= + +################################################################################## +# Mail configuration. Must be configured to enable user registration confirmation. +################################################################################## + +#------------------------ +# 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.quitwait=false + +#------------------------ +# SSL SMTP Server Configuration +#------------------------ + +#------------------------ +# GMAIL SMTP Configuration +#------------------------ +#mail.smtp.port=587 +#mail.smtp.host=smtp.gmail.com +#mail.username= +#mail.password= +#mail.smtp.auth=true +#mail.smtp.starttls.enable=true +#mail.smtp.quitwait=false + +#------------------------ +# Emails configuration +#------------------------ + +# Required: "from" email account that will appear in the emails sent from the sender. +mail.serverSendEmail=root@localhost + +# Optional: Support account that the users could use to contact you. This address will appear in emails and in some places in the site. +mail.supportEmail=root@localhost + +# Optional: Unexpected errors will be reported to this address. +mail.errorReporterEmail=support@wisemapping.com + +################################################################################## +# Users Registration Configuration +################################################################################## + +# Enable/Disable user registration confirmation by e-mail. If it's enabled, mail must be configured. +registration.email.enabled = false + +# Enable captcha confirmation +google.recaptcha.enabled = true + +# ReCaptcha is the default captcha. Public and private keys are required. +# More Info: http://www.google.com/recaptcha . +google.recaptcha.privateKey = 6LeQ4tISAAAAAMfHMPRKyHupTfA-KE4QeTCnLXhK +google.recaptcha.publicKey = 6LeQ4tISAAAAALzCGKNgRv8UqsDx7Cb0vq4wbJBr + +################################################################################## +# Site configuration +################################################################################## + +# Site administration user. This user will have special permissions for operations such as removing users, set password +# etc. +admin.user = admin@wisemapping.org + +# Site URL. This url will be used during sharing emails and public views. +site.baseurl = http://localhost:8080 + +################################################################################## +# Google Analytics Settings +################################################################################## +google.analytics.enabled=false +google.analytics.account=UA-XXXX \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml index f243e1fd..a0c0beaa 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml @@ -72,4 +72,10 @@ + + + + + + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml index 6e9d862c..6a78d4fc 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -111,4 +111,10 @@ + + + + + +