From bd6189a291ffef723e7bb3cdb277e3ea1fb0a3f5 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 17 Apr 2017 10:27:38 +0000
Subject: [PATCH] #3529 config - Preparing jenkins to build war archive
---
securis/src/main/java/net/curisit/securis/GzipFilter.java | 42 +++++++++++++++++++++
securis/src/main/webapp/WEB-INF/web.xml | 11 +++++
securis/src/main/webapp/index.jsp | 26 +++++--------
securis/src/main/webapp/package.json | 1
4 files changed, 64 insertions(+), 16 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/GzipFilter.java b/securis/src/main/java/net/curisit/securis/GzipFilter.java
new file mode 100644
index 0000000..cf0a51a
--- /dev/null
+++ b/securis/src/main/java/net/curisit/securis/GzipFilter.java
@@ -0,0 +1,42 @@
+package net.curisit.securis;
+
+import java.io.IOException;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+@ApplicationScoped
+@WebFilter(urlPatterns = "*.gz")
+public class GzipFilter implements Filter {
+
+ private static final Logger LOG = LogManager.getLogger(GzipFilter.class);
+
+ @Override
+ public void init(FilterConfig fc) throws ServletException {
+ }
+
+ @Override
+ public void doFilter(ServletRequest sreq, ServletResponse sres, FilterChain fc) throws IOException, ServletException {
+ HttpServletRequest req = (HttpServletRequest) sreq;
+ HttpServletResponse res = (HttpServletResponse) sres;
+ res.addHeader("Content-Encoding", "gzip");
+ LOG.info("Content served as gzip: {}", req.getRequestURI());
+ fc.doFilter(sreq, sres);
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+}
diff --git a/securis/src/main/webapp/WEB-INF/web.xml b/securis/src/main/webapp/WEB-INF/web.xml
index 0d4339d..1c1c0f5 100644
--- a/securis/src/main/webapp/WEB-INF/web.xml
+++ b/securis/src/main/webapp/WEB-INF/web.xml
@@ -53,6 +53,17 @@
</filter-mapping>
<filter>
+ <filter-name>GzipFilter</filter-name>
+ <filter-class>
+ net.curisit.securis.GzipFilter
+ </filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>GzipFilter</filter-name>
+ <url-pattern>*.gz</url-pattern>
+ </filter-mapping>
+
+ <filter>
<filter-name>Resteasy</filter-name>
<filter-class>
org.jboss.resteasy.plugins.server.servlet.FilterDispatcher
diff --git a/securis/src/main/webapp/index.jsp b/securis/src/main/webapp/index.jsp
index a6d7f70..ee3f977 100644
--- a/securis/src/main/webapp/index.jsp
+++ b/securis/src/main/webapp/index.jsp
@@ -3,33 +3,27 @@
<head>
<title>SeCuris server</title>
<base href="<%= pageContext.getServletContext().getContextPath() %>/">
- <meta charset="utf-8">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="assets/favicon.png" sizes="32x29" type="image/png">
- <base href="/">
+
+ <script src="jspm_packages/system.js"></script>
-<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/core-js/2.4.1/core.min.js"></script> -->
-
- <!-- Polyfill(s) for older browsers -->
- <script src="node_modules/core-js/client/shim.min.js"></script>
- <script src="node_modules/hammerjs/hammer.min.js"></script>
-
- <script src="node_modules/zone.js/dist/zone.js"></script>
- <script src="node_modules/systemjs/dist/system.src.js"></script>
-
- <script src="systemjs.config.js"></script>
+ <script src="main-bundle.js.gz"></script>
+ <script src="jspm.browser.js"></script>
+ <script src="jspm.config.js"></script>
<script>
- System.import('main').catch(function(err){ console.error(err); });
+ System.import('src/main.js').catch(function(err){ console.error(err); });
</script>
<!-- Load the Covalent platform stylesheet -->
<link href="assets/securis.css" rel="stylesheet">
- <link href="node_modules/@covalent/core/common/platform.css" rel="stylesheet">
+ <link href="assets/theming/platform.css" rel="stylesheet">
<!-- Load the Covalent/Material prebuilt theme -->
- <link href="node_modules/@covalent/core/theming/prebuilt/blue-orange.css" rel="stylesheet">
- <link href="node_modules/ng2-toastr/bundles/ng2-toastr.min.css" rel="stylesheet" />
+ <link href="assets/theming/blue-orange.css" rel="stylesheet">
+
+ <link href="assets/ng2-toastr.min.css" rel="stylesheet" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
</head>
diff --git a/securis/src/main/webapp/package.json b/securis/src/main/webapp/package.json
index 56f93a3..0a7267b 100644
--- a/securis/src/main/webapp/package.json
+++ b/securis/src/main/webapp/package.json
@@ -65,6 +65,7 @@
"protractor": "~4.0.14",
"rimraf": "^2.5.4",
"tslint": "^3.15.1",
+ "jspm": "beta",
"typescript": "^2.2.1"
},
"jspm": {
--
Gitblit v1.3.2