From 03bb887907c29f9779ff9761fd4ae15ce8bce013 Mon Sep 17 00:00:00 2001
From: Gonzalo Bellver <gonzalo.bellver@gmail.com>
Date: Thu, 16 Aug 2012 22:32:57 -0300
Subject: [PATCH 1/4] removed MindMap.hbm.xml

---
 .../com/wisemapping/model/MindMap.hbm.xml     | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 wise-webapp/src/main/resources/com/wisemapping/model/MindMap.hbm.xml

diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/MindMap.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/MindMap.hbm.xml
deleted file mode 100644
index 84a14e18..00000000
--- a/wise-webapp/src/main/resources/com/wisemapping/model/MindMap.hbm.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping>
-
-    <class name="com.wisemapping.model.Mindmap" table="MINDMAP">
-        <id name="id">
-            <generator class="increment"/>
-        </id>
-        <property name="title"/>
-        <property name="public"/>
-        <property name="description"/>
-        <property name="zippedXml" column="XML"/>
-        <property name="lastModificationTime" column="edition_date"/>
-        <property name="creationTime" column="creation_date"/>
-        <property name="tags" column="tags"/>
-        <many-to-one name="creator" column="creator_id" unique="true" not-null="false" lazy="proxy"/>
-        <many-to-one name="lastEditor" column="last_editor_id" unique="false" not-null="true" lazy="proxy"/>
-
-        <set name="collaborations"
-             cascade="all,delete-orphan"
-             inverse="true">
-            <key column="MINDMAP_ID" not-null="true"/>
-            <one-to-many class="com.wisemapping.model.Collaboration"/>
-        </set>
-    </class>
-
-</hibernate-mapping>
\ No newline at end of file

From 6a673d187b1f12ed40ba8069f919c4f7d4e869cd Mon Sep 17 00:00:00 2001
From: Gonzalo Bellver <gonzalo.bellver@gmail.com>
Date: Thu, 16 Aug 2012 22:33:38 -0300
Subject: [PATCH 2/4] added Mindamp.hbm.xml

---
 .../com/wisemapping/model/Mindmap.hbm.xml     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml

diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml
new file mode 100644
index 00000000..84a14e18
--- /dev/null
+++ b/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+    <class name="com.wisemapping.model.Mindmap" table="MINDMAP">
+        <id name="id">
+            <generator class="increment"/>
+        </id>
+        <property name="title"/>
+        <property name="public"/>
+        <property name="description"/>
+        <property name="zippedXml" column="XML"/>
+        <property name="lastModificationTime" column="edition_date"/>
+        <property name="creationTime" column="creation_date"/>
+        <property name="tags" column="tags"/>
+        <many-to-one name="creator" column="creator_id" unique="true" not-null="false" lazy="proxy"/>
+        <many-to-one name="lastEditor" column="last_editor_id" unique="false" not-null="true" lazy="proxy"/>
+
+        <set name="collaborations"
+             cascade="all,delete-orphan"
+             inverse="true">
+            <key column="MINDMAP_ID" not-null="true"/>
+            <one-to-many class="com.wisemapping.model.Collaboration"/>
+        </set>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file

From 05301dea6dee398bf048939ba698bf5ba5c5b045 Mon Sep 17 00:00:00 2001
From: Gonzalo Bellver <gonzalo.bellver@gmail.com>
Date: Fri, 17 Aug 2012 12:16:01 -0300
Subject: [PATCH 3/4] 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=<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
\ 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 @@
         <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>
\ 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 @@
             </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>

From 141d69114867396c6bcadbc2ce5a13547a70ddad Mon Sep 17 00:00:00 2001
From: Gonzalo Bellver <gonzalo.bellver@gmail.com>
Date: Fri, 17 Aug 2012 12:27:07 -0300
Subject: [PATCH 4/4] added jetty runnner to pom

---
 wise-webapp/pom.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index b55a00af..a5f7aec0 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -496,6 +496,28 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals><goal>copy</goal></goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.mortbay.jetty</groupId>
+                                    <artifactId>jetty-runner</artifactId>
+                                    <version>7.4.5.v20110725</version>
+                                    <destFileName>jetty-runner.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>