Deployment on heroku

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

branchtest.txt

@@ -1,2 +0,0 @@
-This is wisemapping.
-But we both share the same core.

branchtest2.txt

@@ -1 +0,0 @@
-This file is shared

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=<gmail-user-account>
+#mail.password=<gmail-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

wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml

@@ -72,4 +72,10 @@
         <property name="adminUser" value="${admin.user}"/>
     </bean>
 
+    <beans profile="production">
+        <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+            <property name="location" value="/WEB-INF/prod.properties" />
+        </bean>
+    </beans>
+
 </beans>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml

@@ -111,4 +111,10 @@
             </list>
         </property>
     </bean>
+
+    <beans profile="production">
+        <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+            <property name="location" value="/WEB-INF/prod.properties" />
+        </bean>
+    </beans>
 </beans>