Tomcat upgraded to 8.5.11 (#4817)

* Added set of logging libs, synced setenv with upstream
eclipse-che · Apr 18, 2017 · b0dfd90 · b0dfd90
1 parent 1d10171
commit b0dfd90
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 18 deletions.
diff --git a/assembly/assembly-main/src/assembly/tomcat/conf/server.xml b/assembly/assembly-main/src/assembly/tomcat/conf/server.xml
@@ -151,11 +151,7 @@
          <Valve className="org.apache.catalina.valves.RemoteIpValve" protocolHeader="X-Forwarded-Proto"
                  internalProxies="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"/>
 
-          <!-- Access log processes all example.
-               Documentation at: /docs/config/valve.html
-               Note: The pattern used is equivalent to using pattern="common" -->
-        <Valve className="ch.qos.logback.access.tomcat.LogbackValve" quiet="true"
-               filename="${catalina.home}/conf/logback-access-localhost.xml" />
+        <Valve className="ch.qos.logback.access.tomcat.LogbackValve" quiet="true" />
 
       </Host>
     </Engine>

diff --git a/assembly/assembly-wsagent-server/src/assembly/server.xml b/assembly/assembly-wsagent-server/src/assembly/server.xml
@@ -137,11 +137,7 @@
         <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
         -->
 
-        <!-- Access log processes all example.
-             Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
-        <Valve className="ch.qos.logback.access.tomcat.LogbackValve" quiet="true"
-               filename="${catalina.home}/conf/logback-access-localhost.xml" />
+        <Valve className="ch.qos.logback.access.tomcat.LogbackValve" quiet="true" />
 
       </Host>
     </Engine>

diff --git a/assembly/assembly-wsagent-server/src/assembly/setenv.sh b/assembly/assembly-wsagent-server/src/assembly/setenv.sh
@@ -18,6 +18,8 @@
 #Global LOGS DIR
 [ -z "${CHE_LOGS_DIR}" ]  && CHE_LOGS_DIR="$CATALINA_HOME/logs"
 
+[ -z "${CHE_LOGS_LEVEL}" ]  && CHE_LOGS_LEVEL="INFO"
+
 [ -z "${JPDA_ADDRESS}" ]  && JPDA_ADDRESS="4403"
 
 #Tomcat options
@@ -30,9 +32,7 @@
 [ -z "${CLASSPATH}" ]  && CLASSPATH="${CATALINA_HOME}/conf/:${JAVA_HOME}/lib/tools.jar"
 
 
-export JAVA_OPTS="$JAVA_OPTS  -Dche.logs.dir=${CHE_LOGS_DIR}"
-
+export JAVA_OPTS="$JAVA_OPTS  -Dche.logs.dir=${CHE_LOGS_DIR} -Dche.logs.level=${CHE_LOGS_LEVEL} -Djuli-logback.configurationFile=file:$CATALINA_HOME/conf/tomcat-logger.xml"
 
-#Class path
 [ -z "${SERVER_PORT}" ]  && SERVER_PORT=8080
 export SERVER_PORT
diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml
@@ -30,6 +30,10 @@
             <groupId>aopalliance</groupId>
             <artifactId>aopalliance</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -238,6 +242,18 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -253,11 +269,6 @@
             <artifactId>tomcat-catalina</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-test</artifactId>

diff --git a/wsagent/che-wsagent-core/pom.xml b/wsagent/che-wsagent-core/pom.xml
@@ -22,6 +22,10 @@
     <packaging>war</packaging>
     <name>Che Workspace Agent War Packaging</name>
     <dependencies>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -106,6 +110,18 @@
             <groupId>org.everrest</groupId>
             <artifactId>everrest-websockets</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -132,6 +148,10 @@
                         <configuration>
                             <ignoredDependencies>
                                 <ignoredDependency>org.everrest:everrest-core</ignoredDependency>
+                                <ignoredDependency>ch.qos.logback:logback-classic</ignoredDependency>
+                                <ignoredDependency>org.slf4j:jul-to-slf4j</ignoredDependency>
+                                <ignoredDependency>org.slf4j:jcl-over-slf4j</ignoredDependency>
+                                <ignoredDependency>org.slf4j:log4j-over-slf4j</ignoredDependency>
                             </ignoredDependencies>
                         </configuration>
                     </execution>