diff --git a/navalplanner-webapp/src/main/webapp/META-INF/context.xml b/navalplanner-webapp/src/main/webapp/META-INF/context.xml
new file mode 100644
index 000000000..2e7abd5c3
--- /dev/null
+++ b/navalplanner-webapp/src/main/webapp/META-INF/context.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <Context antiJARLocking="true" path="">    
+    <ResourceLink name="${dataSource.jndiName}"
+        global="${dataSource.jndiName}"
+        type="javax.sql.DataSource">
+    </ResourceLink>                
+</Context>
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml b/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
index bf3a678d6..d42116b48 100644
--- a/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
@@ -3,7 +3,7 @@
     xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-    <display-name>helloworld</display-name>
+    <display-name>navalplanner-webapp</display-name>
 
     <!--
         It searches all navalplanner-business-spring-config.xml files, it can
diff --git a/pom.xml b/pom.xml
index 195804a1f..519428d1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -385,6 +385,23 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webapp/META-INF</directory>
+                            <targetPath>META-INF</targetPath>
+                            <filtering>true</filtering>
+                            <includes>
+                                <include>context.xml</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+
             <!-- =========================================================== -->
             <!-- Jetty configuration -->
             <plugin>