From: John  Keeney <John.Keeney@est.tech>
Date: Fri, 15 May 2020 20:12:47 +0000 (+0000)
Subject: Merge "Possibility to create and edit typeless policies"
X-Git-Tag: BronzeRC0~6
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=6e3a6f5c61a6af69255862c485fd597c39f69268;hp=f3153ee6f2ea63afda276c7c3abab9ee4004820b;p=portal%2Fnonrtric-controlpanel.git

Merge "Possibility to create and edit typeless policies"
---

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 8b6599d..3ec22cb 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -192,6 +192,24 @@ limitations under the License.
     </dependencies>
     <build>
         <plugins>
+        <plugin>
+             <groupId>org.codehaus.mojo</groupId>
+             <artifactId>build-helper-maven-plugin</artifactId>
+             <executions>
+              <execution>
+               <id>add-source</id>
+               <phase>generate-sources</phase>
+               <goals>
+                <goal>add-source</goal>
+               </goals>
+               <configuration>
+                <sources>
+                 <source>${project.build.directory}/generated-sources/annotations/</source>
+                </sources>
+               </configuration>
+              </execution>
+             </executions>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/TomcatWebServerConfiguration.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/TomcatWebServerConfiguration.java
index 7e9f8d1..c9ef723 100644
--- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/TomcatWebServerConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/TomcatWebServerConfiguration.java
@@ -19,7 +19,11 @@
  */
 package org.oransc.portal.nonrtric.controlpanel.config;
 
+import java.lang.invoke.MethodHandles;
 import org.apache.catalina.connector.Connector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
@@ -28,17 +32,25 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class TomcatWebServerConfiguration {
 
+    private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+    @Value("${server.http.port}")
+    private int httpPort;
+
     @Bean
     public ServletWebServerFactory servletContainer() {
+        logger.debug("Http Port: {}", httpPort);
         TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
-        tomcat.addAdditionalTomcatConnectors(getHttpConnector());
+        if (httpPort > 0) {
+            tomcat.addAdditionalTomcatConnectors(getHttpConnector(httpPort));
+        }
         return tomcat;
     }
 
-    private static Connector getHttpConnector() {
+    private static Connector getHttpConnector(int port) {
         Connector connector = new Connector(TomcatServletWebServerFactory.DEFAULT_PROTOCOL);
         connector.setScheme("http");
-        connector.setPort(8080);
+        connector.setPort(port);
         connector.setSecure(false);
         return connector;
     }
diff --git a/webapp-backend/src/main/resources/application.properties b/webapp-backend/src/main/resources/application.properties
index 267fff3..c2d5e1a 100644
--- a/webapp-backend/src/main/resources/application.properties
+++ b/webapp-backend/src/main/resources/application.properties
@@ -23,11 +23,12 @@
 
 # A spring property but without a "spring" prefix;
 # the port number is chosen RANDOMLY when running tests
-server.port = 8434
+server.port = 8082
 server.ssl.key-store-type = PKCS12
 server.ssl.key-store-password = ericsson_kwdjfhw
 server.ssl.key-store =  classpath:keystore.jks
 server.ssl.key-password = ericsson_kwdjfhw
+server.http.port = 8080