From 29210e6702347d26f5784dd69a40b70042e8ff28 Mon Sep 17 00:00:00 2001 From: Matthieu Geerebaert Date: Thu, 26 Mar 2020 10:08:13 +0100 Subject: [PATCH] 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 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 6083f1d92e44d56eb001be5488ac42cdb5218ee2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2651 zcmY+EcR1UN8pnT$#7ga;YS%bsB}T2Pt)z+ybDs0Z`@HY-{eIu?pC1H{*&Ym{L*SU%>6v5_jS~-8Knx%P zju`~OG5tc|m<|y*DCQp))CGcrI-bdPXJbVV``_0&W)PTwgZxC`AO{F(dglMjXXX45 zcr*z86z`TCUrAUoI;;o^VQiWf1k(Y%77!d{P^ryFMAV1V1O1!Vl5dcOl9 zpS*=*HQIk9I*w6F{`FJ~Ah){jd|TMc)pd_^BPJy#93Ep$Plh=8UrBuN6XfyW%3r+J zcf&fQN#^eHR=S6nt?Qu3%AXzKhjP~0C~SY3jmS~3RY0??>N(-j8RrI z33hxM6POZhmOFe~RmLIMDdsJ&sZPZl z>Mtx{sVn@(96Z6s%d4P0!L+fZ!3uNten}H?6BC-c_Gjk0kES+SKMYy$6JBj;ajS8M_}7 zTfK(sxh`b6>Stg29Hr7++vM8%a-m^q@O0!gRBggn?^^NYZ8%)p(^>#Xj%*4eJ7(X5 zKlFRTmFcg2zFg0&(h_|_wJCcC+xO{LuCTg4m=p1}H8kipqOx`}FhU^{es`5F3Yh7x^Y_U%`3l3)gEoFX=$gYG<7WxSwf?D3=VU^=g4(^70I zp!E>>jpOBF`U#Qti;4S%QCc~83|Wi&!ELU9~Mt_ zOipyt7sCN)ARph<6B}4shuF&ZkHSiFrPW*)HB0j44^bM&^{DrMD@UW>2 z56&jOzS%C!BuH{;2W;}cxPkN|-R@zkb~>eDQgMIKQPPXlO!BGerL4w@hP1SIU!i$` zG*QUr(6|TKBCg%Za+X{A-lb^x^esBo;@W~fCPJ(YrpInE<9Nlr3hZ3xid}UrwNv0G z^hig2*ci{#q+5CnY)gWjEfe)_%KO~NA&?eb%6YW%(V%Y2Ng1n}+7qcf&Oz`vZo|8= z*!RuvHCDnIv^eU}k=x)$f5EipMjBiW8VEXpER% zi=5rU%)YJKwv0661U5dn1L!IS1#W(R8%zS49=BO%XzYLTi>7W$qIyamz<7sfd6R-q zq;9*?6XK5T$Z>_7Nqm!)(Z$n0(b2lRJ4c8s&*SK>*qmGl*(hL8R+eYx$=xqeWttD# zJveR7ygybUZhv)N-QjvHDuuy=;LTC4D68FSrDEUOw?|e z&G@2~ZThtn5c=^6%NAW7>t=6;30Rxr6dwlnbNL1Y3088u zX=1rmc&wZ*d5YUMlU}=6s?d*w;HzJZhaO9cv#%1u63mx4e&()~yeHFxT*PcxM?c9s zTZA_x@b+f~TYhYr<4p`@AH~)do{R0nl0~jK7j4izYz#*kwKQ9HTiMkRxW7hG?p@d$ zZt3k*x_r=H)rBU0&VTOW-l_Xj*%I{5KU}RZhthi-JdUel#e`e_N0MlwF zV_`!P%Q}BdU+b^a?o6V-hUREMg1>qSOZixEWm2l&CR)666aChU>XW`$fiDSpo(Sv^ zs~M4&w+%vz#-QJ+?FTBaz9E5gt)?28Zw(G8cXA!HXP>Tl4(I$P;MJl=a~utPV2@I% z{=!I{S=pw{XcO@W-(SDyS$^>LVzCq4h=mX%qMGg#SPcsp?R9o^Q7y5mQ)LnEz9X@Q-962z_C4n3L{gp1VcZ*8@(j>x>v58Fubzo+J@z22H76(a z=|&xQ!7fXT>5h?wTa+g5^k&P#?P>22E&{3;wVeU3ItG%8@A9+mhmKdkr^B%qr@aTm z;RfwKF?uU|^7EG33W5kOZ@H|Ushi}fZ{4hv3h346K{`f`w_6Y&0?UglB{J}yZ5*K7 z+Gkfd=j>dRi#i7aEIk~w+pR4G0@X=s>sF6-8~xetuCbxfISgS( z)slK^TGOKODl6B1*m%(#F}!3XJ%MFWfF~`(NL=MdY2Yb0KRUS-wXcBU-QWt5HZpH?tX_33guo>b+t#wTd`4=y8jsc