From 6d3b3410e9b1b91d0b2fb5e94bb35eb66a58c991 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 21 Dec 2010 17:07:45 +0100
Subject: [PATCH] Some renames in Debian package.

* Renamed war in order to use just navalplan instead of navalplanner-webapp.
* Renamed data source name for context.xml now using navalplan-ds.

FEA: ItEr66S03CommunityMaterialItEr65S04
---
 debian/51navalplan.policy | 4 ++--
 debian/navalplan.install  | 2 +-
 debian/navalplan.postinst | 2 +-
 debian/rules              | 6 ++++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/51navalplan.policy b/debian/51navalplan.policy
index fd1df886d..eb1b8f11c 100644
--- a/debian/51navalplan.policy
+++ b/debian/51navalplan.policy
@@ -1,6 +1,6 @@
-grant codeBase "file:/var/lib/tomcat6/webapps/navalplanner-webapp/-" {
+grant codeBase "file:/var/lib/tomcat6/webapps/navalplan/-" {
 	permission java.security.AllPermission;
 };
-grant codeBase "file:/var/lib/tomcat6/webapps/navalplanner-webapp.war" {
+grant codeBase "file:/var/lib/tomcat6/webapps/navalplan.war" {
 	permission java.security.AllPermission;
 };
diff --git a/debian/navalplan.install b/debian/navalplan.install
index 4ed4fdf36..bce06e122 100644
--- a/debian/navalplan.install
+++ b/debian/navalplan.install
@@ -1,4 +1,4 @@
-debian/tmp/var/lib/tomcat6/webapps/navalplanner-webapp.war
+debian/tmp/var/lib/tomcat6/webapps/navalplan.war
 debian/tmp/etc/tomcat6/policy.d/51navalplan.policy
 debian/tmp/usr/share/dbconfig-common/data/navalplan/install/pgsql
 debian/tmp/usr/share/tomcat6/lib/postgresql-jdbc3.jar
diff --git a/debian/navalplan.postinst b/debian/navalplan.postinst
index a554cffda..9ca90ac3d 100644
--- a/debian/navalplan.postinst
+++ b/debian/navalplan.postinst
@@ -32,7 +32,7 @@ then
 		if [[ ${line} = *\</Context\>* ]] ; then
 			cat <<-EOF
 				<!-- begin:navalplan -->
-				<Resource name="jdbc/navalplanner-ds" auth="Container"
+				<Resource name="jdbc/navalplan-ds" auth="Container"
 					type="javax.sql.DataSource"
 					maxActive="100" maxIdle="30" maxWait="10000"
 					username="${dbc_dbuser}" password="${dbc_dbpass}"
diff --git a/debian/rules b/debian/rules
index 1673cdd70..ad2927823 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,9 @@ MAKEFLAGS  += s
 JAVA_HOME  := /usr/lib/jvm/java-6-openjdk
 
 MAVEN_REPO := $(CURDIR)/debian/maven-repo
-MAVEN_OPTS := -Pprod,postgresql -Dmaven.test.skip=true -B \
+MAVEN_OPTS := -Pprod,postgresql,-liquibase-update \
+              -DdataSource.jndiName=jdbc/navalplan-ds \
+	      -Dmaven.test.skip=true -B \
               -s $(CURDIR)/debian/maven-settings.xml
 
 
@@ -71,7 +73,7 @@ install:
 	# Commands to install arch-dependant stuff
 	$(call CMD,mkdir -p $(CURDIR)/debian/tmp/var/lib/tomcat6/webapps/)
 	$(call CMD,cp $(CURDIR)/navalplanner-webapp/target/navalplanner-webapp.war \
-		$(CURDIR)/debian/tmp/var/lib/tomcat6/webapps)
+		$(CURDIR)/debian/tmp/var/lib/tomcat6/webapps/navalplan.war)
 	# Install Policy file
 	$(call CMD,mkdir -p $(CURDIR)/debian/tmp/etc/tomcat6/policy.d)
 	$(call CMD,cp $(CURDIR)/debian/51navalplan.policy \