summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ContextListener.java24
-rw-r--r--openecomp-ui/.storybook/fonts/omnes-att-bold.otfbin153056 -> 0 bytes
-rw-r--r--openecomp-ui/.storybook/fonts/omnes-att-light.ttfbin73968 -> 0 bytes
-rw-r--r--openecomp-ui/.storybook/fonts/omnes-att-medium.ttfbin65152 -> 0 bytes
-rw-r--r--openecomp-ui/.storybook/fonts/omnes-att-regular.ttfbin71692 -> 0 bytes
-rw-r--r--openecomp-ui/.storybook/storybook.scss26
6 files changed, 4 insertions, 46 deletions
diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ContextListener.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ContextListener.java
index a355073116..06652c0843 100644
--- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ContextListener.java
+++ b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ContextListener.java
@@ -2,18 +2,12 @@ package org.openecomp.config.impl;
import static org.openecomp.config.Constants.MBEAN_NAME;
-import org.apache.commons.beanutils.FluentPropertyBeanIntrospector;
-import org.openecomp.config.api.ConfigurationManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.lang.management.ManagementFactory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import javax.management.ObjectName;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.annotation.WebListener;
+import org.openecomp.config.api.ConfigurationManager;
@WebListener
public class ContextListener implements ServletContextListener {
@@ -29,20 +23,6 @@ public class ContextListener implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent arg0) {
- try {
- ConfigurationManager.lookup();
- Logger logger = LoggerFactory.getLogger(FluentPropertyBeanIntrospector.class);
- Method method = logger.getClass().getDeclaredMethod("getLevel");
- method.setAccessible(true);
- Object object = method.invoke(logger);
- method = logger.getClass().getDeclaredMethod("setLevel", object.getClass());
- method.setAccessible(true);
- Field field = object.getClass().getDeclaredField("ERROR");
- field.setAccessible(true);
- method.invoke(logger, field.get(logger));
- } catch (Exception exception) {
- exception.printStackTrace();
- }
+ ConfigurationManager.lookup();
}
-
}
diff --git a/openecomp-ui/.storybook/fonts/omnes-att-bold.otf b/openecomp-ui/.storybook/fonts/omnes-att-bold.otf
deleted file mode 100644
index 136afca84c..0000000000
--- a/openecomp-ui/.storybook/fonts/omnes-att-bold.otf
+++ /dev/null
Binary files differ
diff --git a/openecomp-ui/.storybook/fonts/omnes-att-light.ttf b/openecomp-ui/.storybook/fonts/omnes-att-light.ttf
deleted file mode 100644
index 273761ab3d..0000000000
--- a/openecomp-ui/.storybook/fonts/omnes-att-light.ttf
+++ /dev/null
Binary files differ
diff --git a/openecomp-ui/.storybook/fonts/omnes-att-medium.ttf b/openecomp-ui/.storybook/fonts/omnes-att-medium.ttf
deleted file mode 100644
index 2740425412..0000000000
--- a/openecomp-ui/.storybook/fonts/omnes-att-medium.ttf
+++ /dev/null
Binary files differ
diff --git a/openecomp-ui/.storybook/fonts/omnes-att-regular.ttf b/openecomp-ui/.storybook/fonts/omnes-att-regular.ttf
deleted file mode 100644
index 2342be4be5..0000000000
--- a/openecomp-ui/.storybook/fonts/omnes-att-regular.ttf
+++ /dev/null
Binary files differ
diff --git a/openecomp-ui/.storybook/storybook.scss b/openecomp-ui/.storybook/storybook.scss
index ed63bb9ab5..fabe892f38 100644
--- a/openecomp-ui/.storybook/storybook.scss
+++ b/openecomp-ui/.storybook/storybook.scss
@@ -1,32 +1,10 @@
$PORT: '9090';
$PROD_MACHINE: '10.147.92.78';
-@font-face {
- font-family: omnes-light;
- src: url('http://localhost:#{$PORT}/omnes-att-light.ttf'),
- url('http://#{$PROD_MACHINE}:#{$PORT}/omnes-att-light.ttf');
-}
-
-@font-face {
- font-family: omnes-regular;
- src: url('http://localhost:#{$PORT}/omnes-att-regular.ttf'),
- url('http://#{$PROD_MACHINE}:#{$PORT}/omnes-att-regular.ttf');
-}
-
-@font-face {
- font-family: omnes-medium;
- src: url('http://localhost:#{$PORT}/omnes-att-medium.ttf'),
- url('http://#{$PROD_MACHINE}:#{$PORT}/omnes-att-medium.ttf');
-}
-
-@font-face {
- font-family: omnes-bold;
- src: url('http://localhost:#{$PORT}/omnes-att-bold.otf'),
- url('http://#{$PROD_MACHINE}:#{$PORT}/omnes-att-bold.otf');
-}
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700');
body {
@import '../resources/scss/bootstrap.scss';
- font-family: omnes-medium,sans-serif;
+ font-family: 'Open Sans',sans-serif;
font-size: 14px;
} \ No newline at end of file