Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport

2014-01-21 01:47:39 -03:00
parent 2aa68c3d4b 9c4dfb7f25
commit 091955255b
4 changed files with 85 additions and 62 deletions
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -555,6 +555,20 @@
                </executions>
            </plugin>

+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <configuration>
+                    <path>/wisemapping</path>
+                    <warFile>${project.build.directory}/wisemapping.war</warFile>
+                    <mode>war</mode>
+                    <update>true</update>
+                    <systemProperties>
+                        <database.base.url>${project.build.directory}</database.base.url>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>