LEP-2990

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@6901 05bdf26c-840f-0410-9ced-eb539d925f36
matethurzo · Jun 15, 2007 · 7b82665 · 7b82665
1 parent ea31b84
commit 7b82665
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/app.server.properties b/app.server.properties
@@ -212,6 +212,8 @@
 ## Tomcat
 ##
 
+    app.server.tomcat.version=5.5
+    #app.server.tomcat.version=6.0
     app.server.tomcat.dir=${app.server.parent.dir}/tomcat-5.5.17
     app.server.tomcat.bin.dir=${app.server.tomcat.dir}/bin
     app.server.tomcat.classes.global.dir=${app.server.tomcat.dir}/common/classes

diff --git a/build-common.xml b/build-common.xml
@@ -50,6 +50,7 @@
 	<property name="java2html.dir" value="${project.dir}/api/${ant.project.name}" />
 	<property name="javadoc.dir" value="${project.dir}/api/${ant.project.name}" />
 
+	<propertycopy name="app.server.version" from="app.server.${app.server.type}.version" silent="true" />
 	<propertycopy name="app.server.dir" from="app.server.${app.server.type}.dir" />
 	<propertycopy name="app.server.bin.dir" from="app.server.${app.server.type}.bin.dir" />
 	<propertycopy name="app.server.classes.global.dir" from="app.server.${app.server.type}.classes.global.dir" />

diff --git a/tools/ext_tmpl/build-common.xml b/tools/ext_tmpl/build-common.xml
@@ -51,6 +51,7 @@
 	<property name="java2html.dir" value="${project.dir}/api/${ant.project.name}" />
 	<property name="javadoc.dir" value="${project.dir}/api/${ant.project.name}" />
 
+	<propertycopy name="app.server.version" from="app.server.${app.server.type}.version" silent="true" />
 	<propertycopy name="app.server.dir" from="app.server.${app.server.type}.dir" />
 	<propertycopy name="app.server.bin.dir" from="app.server.${app.server.type}.bin.dir" />
 	<propertycopy name="app.server.classes.global.dir" from="app.server.${app.server.type}.classes.global.dir" />