From 29210e6702347d26f5784dd69a40b70042e8ff28 Mon Sep 17 00:00:00 2001 From: Matthieu Geerebaert Date: Thu, 26 Mar 2020 10:08:13 +0100 Subject: Remove dead code around ssl support & activate tomcat port log Log INFO: o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat initialized with port(s): 8443 (https) Change-Id: Iae79e7fbc1ea104afe881dcfbcff294d3938ec38 Issue-ID: EXTAPI-418 Signed-off-by: MatthieuGeerebaert --- .../nbi/configuration/HttpAndHttpsContainer.java | 47 --------------------- src/main/resources/application-ssl.properties | 24 ----------- src/main/resources/application.properties | 1 + src/main/resources/keystore/nbi.onap.p12 | Bin 2651 -> 0 bytes 4 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 src/main/java/org/onap/nbi/configuration/HttpAndHttpsContainer.java delete mode 100644 src/main/resources/application-ssl.properties delete mode 100644 src/main/resources/keystore/nbi.onap.p12 (limited to 'src') diff --git a/src/main/java/org/onap/nbi/configuration/HttpAndHttpsContainer.java b/src/main/java/org/onap/nbi/configuration/HttpAndHttpsContainer.java deleted file mode 100644 index f63728f..0000000 --- a/src/main/java/org/onap/nbi/configuration/HttpAndHttpsContainer.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright (c) 2020 Orange - * - * Licensed 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. - */ - -package org.onap.nbi.configuration; - -import org.apache.catalina.connector.Connector; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; -import org.springframework.boot.web.servlet.server.ServletWebServerFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Component; - -@Component -@Profile("ssl") -public class HttpAndHttpsContainer { - - @Value("${http.port}") - private int httpPort; - - @Bean - public ServletWebServerFactory servletContainer() { - TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory(); - tomcat.addAdditionalTomcatConnectors(createStandardConnector()); - return tomcat; - } - - private Connector createStandardConnector() { - Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); - connector.setPort(httpPort); - return connector; - } - -} diff --git a/src/main/resources/application-ssl.properties b/src/main/resources/application-ssl.properties deleted file mode 100644 index 994083a..0000000 --- a/src/main/resources/application-ssl.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2018 Orange -# -# Licensed 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. -# - -http.port=8080 - -# tls/ssl -server.port=8443 -server.ssl.key-store=classpath:keystore/nbi.onap.p12 -server.ssl.key-store-type=PKCS12 -server.ssl.key-store-password=externalapi -server.ssl.key-alias=nbi.onap diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b146afd..d3a7d19 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -30,6 +30,7 @@ server.port = 8080 # LOGGING logging.level. = WARN logging.level.org.springframework = OFF +logging.level.org.springframework.boot.web = INFO logging.level.org.onap = INFO logging.level.root = WARN spring.main.banner-mode = off diff --git a/src/main/resources/keystore/nbi.onap.p12 b/src/main/resources/keystore/nbi.onap.p12 deleted file mode 100644 index 6083f1d..0000000 Binary files a/src/main/resources/keystore/nbi.onap.p12 and /dev/null differ -- cgit 1.2.3-korg