make it deployable (#48)

 make it deployable in tomcat

Author: vasile-baluta

pom.xml

@@ -3,7 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.ericsson</groupId>
     <artifactId>eiffel-intelligence</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
+    
+    <packaging>war</packaging>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -47,6 +49,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+    		<exclusion>
+        		<groupId>org.springframework.boot</groupId>
+        		<artifactId>spring-boot-starter-tomcat</artifactId>
+    		</exclusion>
+    		</exclusions>
         </dependency>
 
         <dependency>
@@ -69,6 +77,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        
+         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -245,6 +259,14 @@
                     </includes>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-war-plugin</artifactId>
+                  <configuration>
+                      <failOnMissingWebXml>false</failOnMissingWebXml>
+                  </configuration>
+             </plugin>
 
         </plugins>
     </build>

src/main/java/com/ericsson/ei/App.java

@@ -18,6 +18,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -28,24 +30,29 @@
 @SpringBootApplication
 @EnableAsync
 @EnableScheduling
-public class App {
-
-    public static void main(String[] args) {
-
-        List<String> logLevels = new ArrayList<>();
-        Collections.addAll(logLevels, "ALL", "DEBUG", "ERROR", "FATAL", "INFO", "TRACE", "WARN");
-
-        if(args != null && args.length > 0 && logLevels.contains(args[0])) {
-            System.setProperty("logging.level.root", args[0]);
-            System.setProperty("logging.level.org.springframework.web", args[0]);
-            System.setProperty("logging.level.com.ericsson.ei", args[0]);
-        } else {
-            System.setProperty("logging.level.root", "OFF");
-            System.setProperty("logging.level.org.springframework.web", "OFF");
-            System.setProperty("logging.level.com.ericsson.ei", "OFF");
-        }
-
-        SpringApplication.run(App.class, args);
-    }
+public class App extends SpringBootServletInitializer {
+
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(App.class);
+	}
+
+	public static void main(String[] args) {
+
+		List<String> logLevels = new ArrayList<>();
+		Collections.addAll(logLevels, "ALL", "DEBUG", "ERROR", "FATAL", "INFO", "TRACE", "WARN");
+
+		if (args != null && args.length > 0 && logLevels.contains(args[0])) {
+			System.setProperty("logging.level.root", args[0]);
+			System.setProperty("logging.level.org.springframework.web", args[0]);
+			System.setProperty("logging.level.com.ericsson.ei", args[0]);
+		} else {
+			System.setProperty("logging.level.root", "OFF");
+			System.setProperty("logging.level.org.springframework.web", "OFF");
+			System.setProperty("logging.level.com.ericsson.ei", "OFF");
+		}
+
+		SpringApplication.run(App.class, args);
+	}
 
 }

src/main/java/com/ericsson/ei/waitlist/WaitListWorker.java

@@ -72,18 +72,19 @@ public void run() {
             String event = dbObject.get("Event").toString();
             rulesObject = rulesHandler.getRulesForEvent(event);
             String idRule = rulesObject.getIdentifyRules();
-           if (idRule != null && !idRule.isEmpty()) {
-            JsonNode ids = jmesPathInterface.runRuleOnEvent(idRule, event);
-            if (ids.isArray()) {
-                for (final JsonNode idJsonObj : ids) {
-                    ArrayList<String> objects = matchIdRulesHandler.fetchObjectsById(rulesObject, idJsonObj.textValue());
-                    if (objects.size() > 0) {
-                        rmqHandler.publishObjectToWaitlistQueue(event);
-                        waitListStorageHandler.dropDocumentFromWaitList(document);
+
+            if (idRule != null && !idRule.isEmpty()) {
+                JsonNode ids = jmesPathInterface.runRuleOnEvent(idRule, event);
+                if (ids.isArray()) {
+                    for (final JsonNode idJsonObj : ids) {
+                        ArrayList<String> objects = matchIdRulesHandler.fetchObjectsById(rulesObject, idJsonObj.textValue());
+                        if (objects.size() > 0) {
+                            rmqHandler.publishObjectToWaitlistQueue(event);
+                            waitListStorageHandler.dropDocumentFromWaitList(document);
+                        }
                     }
                 }
-            }
-           }
+            }           
         }
     }
 }