Merge branch 'ODN_v1.0.1'

OpenDataNode · Apr 28, 2015 · 15f9418 · 15f9418
2 parents a52903c + ceb13a4
commit 15f9418
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>sk.eea.edem</groupId>
     <artifactId>odn-cas-overlay</artifactId>
     <packaging>war</packaging>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <build>
         <plugins>

diff --git a/src/deb/usr/share/odn-cas/conf/server.xml b/src/deb/usr/share/odn-cas/conf/server.xml
@@ -69,10 +69,10 @@
          APR (HTTP/AJP) Connector: /docs/apr.html
          Define a non-SSL HTTP/1.1 Connector on port 8080
     -->
-    <Connector port="38080" protocol="HTTP/1.1"
+    <!-- Connector port="38080" protocol="HTTP/1.1"
                connectionTimeout="20000"
                URIEncoding="UTF-8"
-               redirectPort="38443" />
+               redirectPort="38443" / -->
     <!-- A "Connector" using the shared thread pool-->
     <!--
     <Connector executor="tomcatThreadPool"
@@ -87,11 +87,11 @@
 
     <Connector port="38443" protocol="org.apache.coyote.http11.Http11Protocol" SSLEnabled="true"
                maxThreads="150" scheme="https" secure="true"
-               keystoreFile="conf/.keystore" clientAuth="false" sslProtocol="TLS" />
+               keystoreFile="conf/.keystore" clientAuth="false" sslProtocol="TLS" address="127.0.0.1" />
 
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+    <Connector port="38009" protocol="AJP/1.3" redirectPort="8443" />