Browse Source

AMBARI-23171. Ambari logo is missing. (mpapirkovskyy)

Myroslav Papirkovskyi 7 years ago
parent
commit
23743c99fd

+ 1 - 0
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java

@@ -386,6 +386,7 @@ public class AmbariServer {
 
       ServletHolder rootServlet = root.addServlet(DefaultServlet.class, "/");
       rootServlet.setInitParameter("dirAllowed", "false");
+      rootServlet.setInitParameter("precompressed", "gzip=.gz");
       rootServlet.setInitOrder(1);
 
       /* Configure default servlet for agent server */

BIN
ambari-web/gzip-content.ps1


+ 38 - 0
ambari-web/gzip-content.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+force_command=""
+save_original=false
+eval last=\${$#}
+file=$last
+while test $# -gt 0
+do
+    case "$1" in
+        -f) force_command="-f"
+            ;;
+        -c) save_original=true
+            ;;
+    esac
+    shift
+done
+case $save_original in
+  (true)    gzip "$force_command" -c -- "$file" > "$file.gz";;
+  (false)   gzip "$force_command" "$file";;
+esac

+ 2 - 1
ambari-web/pom.xml

@@ -240,6 +240,7 @@
                             <tasks>
                                 <apply executable="${executable.gzip}">
                                     <arg value="-f"/>
+                                    <arg value="-c"/>
                                     <fileset dir="${basedir}/public/img/">
                                         <patternset>
                                             <include name="**/*.png"/>
@@ -334,7 +335,7 @@
                 <envClassifier>linux</envClassifier>
                 <dirsep>/</dirsep>
                 <executable.brunch>brunch</executable.brunch>
-                <executable.gzip>gzip</executable.gzip>
+                <executable.gzip>${basedir}/gzip-content.sh</executable.gzip>
                 <args.brunch></args.brunch>
                 <node.executable>node</node.executable>
                 <executable.mkdir>mkdir</executable.mkdir>