Improve Apache directory server

[lgpl/argeo-commons.git] / server / modules / org.argeo.server.tomcat / conf / server.xml

diff --git a/server/modules/org.argeo.server.tomcat/conf/server.xml b/server/modules/org.argeo.server.tomcat/conf/server.xml
index 736b2494cf844a18512beed01252450f0792b443..f79a912441dd8422bd1c6419c9c0ce6adee0143f 100644 (file)
--- 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="${slc.server.port.http}" protocol="HTTP/1.1"
-                       connectionTimeout="20000" redirectPort="${slc.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="${slc.server.port.ajp}" protocol="AJP/1.3"
-                       redirectPort="${slc.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