RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some renames in Debian package.

Browse source 
* 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
This commit is contained in:
Manuel Rego Casasnovas 2010-12-21 17:07:45 +01:00
parent 76b43a85b6
commit 6d3b3410e9
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/51navalplan.policy vendored
View file

@ -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; 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; permission java.security.AllPermission;
}; };

2
debian/navalplan.install vendored
View file

@ -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/etc/tomcat6/policy.d/51navalplan.policy
debian/tmp/usr/share/dbconfig-common/data/navalplan/install/pgsql debian/tmp/usr/share/dbconfig-common/data/navalplan/install/pgsql
debian/tmp/usr/share/tomcat6/lib/postgresql-jdbc3.jar debian/tmp/usr/share/tomcat6/lib/postgresql-jdbc3.jar

2
debian/navalplan.postinst vendored
View file

@ -32,7 +32,7 @@ then
if [[ ${line} = *\</Context\>* ]] ; then if [[ ${line} = *\</Context\>* ]] ; then
cat <<-EOF cat <<-EOF
<!-- begin:navalplan --> <!-- begin:navalplan -->
<Resource name="jdbc/navalplanner-ds" auth="Container" <Resource name="jdbc/navalplan-ds" auth="Container"
type="javax.sql.DataSource" type="javax.sql.DataSource"
maxActive="100" maxIdle="30" maxWait="10000" maxActive="100" maxIdle="30" maxWait="10000"
username="${dbc_dbuser}" password="${dbc_dbpass}" username="${dbc_dbuser}" password="${dbc_dbpass}"

6
debian/rules vendored
View file

@ -8,7 +8,9 @@ MAKEFLAGS += s
JAVA_HOME := /usr/lib/jvm/java-6-openjdk JAVA_HOME := /usr/lib/jvm/java-6-openjdk
MAVEN_REPO := $(CURDIR)/debian/maven-repo 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 -s $(CURDIR)/debian/maven-settings.xml
@ -71,7 +73,7 @@ install:
# Commands to install arch-dependant stuff # Commands to install arch-dependant stuff
$(call CMD,mkdir -p $(CURDIR)/debian/tmp/var/lib/tomcat6/webapps/) $(call CMD,mkdir -p $(CURDIR)/debian/tmp/var/lib/tomcat6/webapps/)
$(call CMD,cp $(CURDIR)/navalplanner-webapp/target/navalplanner-webapp.war \ $(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 # Install Policy file
$(call CMD,mkdir -p $(CURDIR)/debian/tmp/etc/tomcat6/policy.d) $(call CMD,mkdir -p $(CURDIR)/debian/tmp/etc/tomcat6/policy.d)
$(call CMD,cp $(CURDIR)/debian/51navalplan.policy \ $(call CMD,cp $(CURDIR)/debian/51navalplan.policy \