X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.server.tomcat%2Fconf%2Fserver.xml;h=f79a912441dd8422bd1c6419c9c0ce6adee0143f;hb=c6c3aa132f6559ac1e2fa015cf2efba92802eba0;hp=507e0febd7f97ac2163378f94fd3e3b98f2b0a18;hpb=e93a2022d143fbb0ff91af11ad1b7206966a3d3e;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.server.tomcat/conf/server.xml b/server/modules/org.argeo.server.tomcat/conf/server.xml
index 507e0febd..f79a91244 100644
--- a/server/modules/org.argeo.server.tomcat/conf/server.xml
+++ b/server/modules/org.argeo.server.tomcat/conf/server.xml
@@ -62,8 +62,8 @@
 			/docs/config/ajp.html APR (HTTP/AJP) Connector: /docs/apr.html Define
 			a non-SSL HTTP/1.1 Connector on port 8080
 		-->
-		<Connector port="${server.port.http}" protocol="HTTP/1.1"
-			connectionTimeout="20000" redirectPort="${server.port.https}" />
+		<Connector port="${argeo.server.port.http}" protocol="HTTP/1.1"
+			connectionTimeout="20000" redirectPort="${argeo.server.port.https}" />
 		<!-- A "Connector" using the shared thread pool-->
 		<!--
 			<Connector executor="tomcatThreadPool" port="8080"
@@ -81,8 +81,8 @@
 		-->
 
 		<!-- Define an AJP 1.3 Connector on port 8009 -->
-		<Connector port="${server.port.ajp}" protocol="AJP/1.3"
-			redirectPort="${server.port.https}" />
+		<Connector port="${argeo.server.port.ajp}" protocol="AJP/1.3"
+			redirectPort="${argeo.server.port.https}" />
 
 
 		<!--
@@ -124,7 +124,7 @@
 			-->
 			<Host name="localhost" appBase="webapps" unpackWARs="true"
 				autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"
-				workDir="${slc.osgi.dataDir}/tomcat/work">
+				workDir="${argeo.osgi.data.dir}/tomcat/work">
 
 				<!--
 					SingleSignOn valve, share authentication between web applications