This is an automated email from the ASF dual-hosted git repository.

mpapirkovskyy pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 23743c9  AMBARI-23171. Ambari logo is missing. (mpapirkovskyy)
23743c9 is described below

commit 23743c99fd7caee522c6ec740749d11b11472380
Author: Myroslav Papirkovskyi <mpapirkovs...@apache.org>
AuthorDate: Fri Mar 9 09:26:47 2018 +0200

    AMBARI-23171. Ambari logo is missing. (mpapirkovskyy)
---
 .../ambari/server/controller/AmbariServer.java     |   1 +
 ambari-web/gzip-content.ps1                        | Bin 2349 -> 2566 bytes
 ambari-web/gzip-content.sh                         |  38 +++++++++++++++++++++
 ambari-web/pom.xml                                 |   3 +-
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 9eedd26..f8e4d21 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/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 */
diff --git a/ambari-web/gzip-content.ps1 b/ambari-web/gzip-content.ps1
index a6042a1..fe76007 100644
Binary files a/ambari-web/gzip-content.ps1 and b/ambari-web/gzip-content.ps1 
differ
diff --git a/ambari-web/gzip-content.sh b/ambari-web/gzip-content.sh
new file mode 100755
index 0000000..99d2c3f
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index bcc0601..a483f19 100644
--- a/ambari-web/pom.xml
+++ b/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>

-- 
To stop receiving notification emails like this one, please contact
mpapirkovs...@apache.org.

Reply via email to