shuber 2005/05/26 18:20:29 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
. build.xml
metadata/war web.xml
Log:
Modification to build system so that we can work with renamed deployment
contexts (such as jahia40, jahia41), making it easier to deploy multiple
version of Jahia on the same Tomcat. In order to change the deployment context
name, in your ant.build.properties file, modify the
AppName=jahia
line.
Revision Changes Path
1.59.4.5 +11 -2 jahia/build.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/build.xml.diff?r1=1.59.4.4&r2=1.59.4.5&f=h
1.41.2.4 +1 -1 jahia/metadata/war/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/metadata/war/web.xml.diff?r1=1.41.2.3&r2=1.41.2.4&f=h
Index: build.xml
===================================================================
RCS file: /home/cvs/repository/jahia/Attic/build.xml,v
retrieving revision 1.59.4.4
retrieving revision 1.59.4.5
diff -u -r1.59.4.4 -r1.59.4.5
--- build.xml 28 Oct 2004 14:59:22 -0000 1.59.4.4
+++ build.xml 26 May 2005 16:20:28 -0000 1.59.4.5
@@ -151,9 +151,14 @@
<copy todir="${build.dist.war}">
<fileset dir="${src.views}"/>
</copy>
+ <copy todir="${build.dist.war.webinf}"
file="${metadata}/war/web.xml">
+ <filterset>
+ <filter token="CONTEXT_NAME" value="${AppName}"/>
+ </filterset>
+ </copy>
<war warfile="${build.dist}/${AppName}.war"
- webxml="${metadata}/war/web.xml"
+ webxml="${build.dist.war.webinf}/web.xml"
excludes="**/*.bak">
<fileset dir="${build.dist.war}">
@@ -218,7 +223,11 @@
</copy>
<mkdir dir="${deploy.webinf}"/>
- <copy todir="${deploy.webinf}" file="${metadata}/war/web.xml"/>
+ <copy todir="${deploy.webinf}" file="${metadata}/war/web.xml">
+ <filterset>
+ <filter token="CONTEXT_NAME" value="${AppName}"/>
+ </filterset>
+ </copy>
<!--
<copy todir="${deploy.webinf}" file="${metadata}/war/weblogic.xml"/>
-->
Index: web.xml
===================================================================
RCS file: /home/cvs/repository/jahia/metadata/war/Attic/web.xml,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -u -r1.41.2.3 -r1.41.2.4
--- web.xml 12 Nov 2004 13:47:32 -0000 1.41.2.3
+++ web.xml 26 May 2005 16:20:29 -0000 1.41.2.4
@@ -67,7 +67,7 @@
be used to generate URLs
-->
<param-name>defaultContextPath</param-name>
- <param-value>/jahia</param-value>
+ <param-value>/@CONTEXT_NAME@</param-value>
</init-param>
<init-param>
<!-- This parameter defines the default servlet path that will
