Make Tomcat more configurable

git-svn-id: https://svn.argeo.org/commons/trunk@5946 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/modules/org.argeo.server.tomcat/.classpath b/server/modules/org.argeo.server.tomcat/.classpath
new file mode 100644 (file)
index 0000000..5f10ee2
--- /dev/null
+++ b/server/modules/org.argeo.server.tomcat/.classpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+</classpath>

diff --git a/server/modules/org.argeo.server.tomcat/.project b/server/modules/org.argeo.server.tomcat/.project
index 723191d7e3ad3be658bd7a3538b8c03664ab74b6..c24b7f3c9777b8a208ec5751e42b02519a08cef1 100644 (file)
--- a/server/modules/org.argeo.server.tomcat/.project
+++ b/server/modules/org.argeo.server.tomcat/.project
@@ -18,5 +18,6 @@
        </buildSpec>
        <natures>
                <nature>org.eclipse.pde.PluginNature</nature>
+               <nature>org.eclipse.jdt.core.javanature</nature>
        </natures>
 </projectDescription>

diff --git a/server/modules/org.argeo.server.tomcat/conf/server.xml b/server/modules/org.argeo.server.tomcat/conf/server.xml
index 2e98917a3404ca7154790643c261302f63738738..b138b46a5ddf2aa56e55ef47d8f757d471283c8f 100644 (file)
--- a/server/modules/org.argeo.server.tomcat/conf/server.xml
+++ b/server/modules/org.argeo.server.tomcat/conf/server.xml
@@ -16,14 +16,17 @@
 
                <!-- HTTP -->
                <Connector executor="tomcatThreadPool" port="${argeo.server.port.http}"
-                       protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="${argeo.server.port.https}" />
-               <!-- HTTPS -->
-               <!-- <Connector port="${argeo.server.port.https}" protocol="HTTP/1.1"
+                       protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="${argeo.server.port.https}"
+                       secure="${argeo.server.http.secure}" proxyName="${argeo.server.http.proxyName}"
+                       proxyPort="${argeo.server.http.proxyPort}" />
+               <!-- HTTPS
+               <Connector port="${argeo.server.port.https}" protocol="HTTP/1.1"
                        SSLEnabled="true" scheme="https" secure="true" sslProtocol="TLS"
                        keystoreFile="${argeo.server.keystoreFile}" keystoreType="JKS"
                        keystorePass="${argeo.server.keystorePass}" truststoreFile="${argeo.server.truststoreFile}"
                        truststoreType="JKS" truststorePass="${argeo.server.truststorePass}"
-                       clientAuth="${argeo.server.https.clientAuth}" /> -->
+                       clientAuth="${argeo.server.https.clientAuth}" />
+                        -->
                <!-- AJP (for proxying with httpd) -->
                <Connector port="${argeo.server.port.ajp}" protocol="AJP/1.3"
                        redirectPort="${argeo.server.port.https}" />

diff --git a/server/modules/org.argeo.server.tomcat/tomcat.properties b/server/modules/org.argeo.server.tomcat/tomcat.properties
index 67f0455eb9dae9dd09e2452c69ea315022e1e220..5e6a5f17bbf9c61a77ff3abd522294537d775519 100644 (file)
--- a/server/modules/org.argeo.server.tomcat/tomcat.properties
+++ b/server/modules/org.argeo.server.tomcat/tomcat.properties
@@ -1,10 +1,14 @@
 argeo.server.port.http=7070
-argeo.server.port.https=7443
-argeo.server.port.ajp=7009
+argeo.server.port.https=7073
+argeo.server.port.ajp=7079
 
 # Used only when SSL is activated (uncommented in server.xml)
 argeo.server.keystoreFile=../../../../ssl/server.ks
 argeo.server.keystorePass=changeit
 argeo.server.truststoreFile=../../../../ssl/server.ts
 argeo.server.truststorePass=changeit
-argeo.server.https.clientAuth=want
\ No newline at end of file
+argeo.server.https.clientAuth=want
+
+argeo.server.http.proxyName=
+argeo.server.http.proxyPort=
+argeo.server.http.secure=false
\ No newline at end of file