Revert "removed any unnecesary tomcat dependencies"

This reverts commit a4df2e0
RestComm · May 7, 2018 · fe1e250 · fe1e250
1 parent 8c51003
commit fe1e250
Show file tree

Hide file tree

Showing 12 changed files with 284 additions and 72 deletions.
diff --git a/restcomm/pom.xml b/restcomm/pom.xml
@@ -204,6 +204,114 @@
                 <artifactId>restcomm-connect.mrb</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.application</artifactId>
+                <version>${project.version}</version>
+                <type>war</type>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.extension.api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.extension.controller</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.monitoring.service</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.dao</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.telephony</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.telephony.api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.http</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.extension.api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.testsuite</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.commons</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.email.api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.sms</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.mgcp</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.mscontrol.api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.mscontrol.mms</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.dns.api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect-management</artifactId>
+                <version>${project.version}</version>
+                <type>war</type>
+            </dependency>
+            <!-- END OF INTERNAL MODULES -->
+
+
+            <!-- SMPP Testing -->
+
+            <dependency>
+                <groupId>org.restcomm</groupId>
+                <artifactId>restcomm-connect.sms.api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.cloudhopper</groupId>
@@ -325,12 +433,6 @@
                 <version>${sipservletapi.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                    <groupId>org.mobicents.servlet.sip</groupId>
-                    <artifactId>sip-servlets-client</artifactId>
-                    <version>${sipservletapi.version}</version>
-                    <scope>provided</scope>
-            </dependency>
 
             <!--dependency> <groupId>org.apache.tomcat</groupId> <artifactId>servlet-api</artifactId>
             <version>${servlet-api.version}</version> </dependency -->
@@ -449,6 +551,19 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-coyote</artifactId>
+                <version>${tomcat7.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jasper</artifactId>
+                <version>${tomcat7.version}</version>
+                <scope>provided</scope>
+            </dependency>
 
             <dependency>
                 <groupId>javax.sip</groupId>
@@ -457,6 +572,19 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.mobicents.servlet.sip.containers</groupId>
+                <artifactId>sip-servlets-catalina-7</artifactId>
+                <version>${sipservletapi.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.mobicents.servlet.sip</groupId>
+                <artifactId>sip-servlets-core-api</artifactId>
+                <version>${sipservletapi.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.mobicents.servlet.sip</groupId>
                 <artifactId>sip-servlets-application-router</artifactId>
@@ -630,25 +758,34 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.sip</groupId>
-            <artifactId>jain-sip-ri</artifactId>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-coyote</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jasper</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
-            <groupId>org.mobicents.servlet.sip</groupId>
-            <artifactId>sip-servlets-application-router</artifactId>
+            <groupId>javax.sip</groupId>
+            <artifactId>jain-sip-ri</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
-            <scope>provided</scope>
+            <groupId>org.mobicents.servlet.sip.containers</groupId>
+            <artifactId>sip-servlets-catalina-7</artifactId>
+            <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.mobicents.servlet.sip</groupId>
+            <artifactId>sip-servlets-application-router</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.hsqldb</groupId>

diff --git a/restcomm/restcomm.application/pom.xml b/restcomm/restcomm.application/pom.xml
@@ -67,7 +67,12 @@
 			<artifactId>sip-servlets-spec</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
+
+		<dependency>
+			<groupId>org.mobicents.servlet.sip.containers</groupId>
+			<artifactId>sip-servlets-catalina-7</artifactId>
+			<scope>provided</scope>
+		</dependency>                
 
 		<dependency>
 			<groupId>javax.servlet</groupId>

diff --git a/restcomm/restcomm.dao/pom.xml b/restcomm/restcomm.dao/pom.xml
@@ -68,7 +68,17 @@
 			<scope>provided</scope>
 		</dependency>
 
-
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-coyote</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mobicents.servlet.sip.containers</groupId>
+			<artifactId>sip-servlets-catalina-7</artifactId>
+			<scope>provided</scope>
+		</dependency>                 
 
 		<dependency>
 			<groupId>com.googlecode.libphonenumber</groupId>

diff --git a/restcomm/restcomm.dns.api/pom.xml b/restcomm/restcomm.dns.api/pom.xml
@@ -19,6 +19,11 @@
 	  <version>${project.version}</version>
 	</dependency>
 
-
+        <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-coyote</artifactId>
+                <scope>provided</scope>
+        </dependency>      
+
   </dependencies>
 </project>
diff --git a/restcomm/restcomm.extension.api/pom.xml b/restcomm/restcomm.extension.api/pom.xml
@@ -39,6 +39,16 @@
 		</dependency>
 
 
-
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-coyote</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mobicents.servlet.sip.containers</groupId>
+			<artifactId>sip-servlets-catalina-7</artifactId>
+			<scope>provided</scope>
+		</dependency>                
 	</dependencies>
 </project>
diff --git a/restcomm/restcomm.extension.controller/pom.xml b/restcomm/restcomm.extension.controller/pom.xml
@@ -47,7 +47,12 @@
             <scope>provided</scope>
         </dependency>
 
-
+        <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-coyote</artifactId>
+                <scope>provided</scope>
+        </dependency>        
+
         <dependency>
             <groupId>org.restcomm</groupId>
             <artifactId>restcomm-connect.dao</artifactId>

diff --git a/restcomm/restcomm.http/pom.xml b/restcomm/restcomm.http/pom.xml
@@ -182,13 +182,34 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.mobicents.servlet.sip.containers</groupId>
+			<artifactId>sip-servlets-catalina-7</artifactId>
+			<version>${sipservletapi.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-application-router</artifactId>
 			<version>${sipservletapi.version}</version>
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-coyote</artifactId>
+			<version>${tomcat7.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jasper</artifactId>
+			<version>${tomcat7.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

diff --git a/restcomm/restcomm.monitoring.service/pom.xml b/restcomm/restcomm.monitoring.service/pom.xml
@@ -74,7 +74,12 @@
 			<scope>provided</scope>
 		</dependency>
 
-
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-coyote</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
         <dependency>
             <groupId>javax.sip</groupId>
             <artifactId>jain-sip-api</artifactId>

diff --git a/restcomm/restcomm.provisioning.number.api/pom.xml b/restcomm/restcomm.provisioning.number.api/pom.xml
@@ -14,12 +14,13 @@
 	  <artifactId>restcomm-connect.commons</artifactId>
 	  <version>${project.version}</version>
 	</dependency>
-
-    <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <scope>provided</scope>
-    </dependency>	
+
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-coyote</artifactId>
+			<scope>provided</scope>
+		</dependency>     
+
   </dependencies>
   <build>
 		<plugins>		

diff --git a/restcomm/restcomm.telephony.api/pom.xml b/restcomm/restcomm.telephony.api/pom.xml
@@ -23,10 +23,10 @@
 			<scope>provided</scope>
 		</dependency>
 
-                                              
+
 		<dependency>
-			<groupId>org.mobicents.servlet.sip</groupId>
-			<artifactId>sip-servlets-client</artifactId>
+			<groupId>org.mobicents.servlet.sip.containers</groupId>
+			<artifactId>sip-servlets-catalina-7</artifactId>
 			<scope>provided</scope>
 		</dependency>                 
 

diff --git a/restcomm/restcomm.telephony/pom.xml b/restcomm/restcomm.telephony/pom.xml
@@ -67,7 +67,17 @@
 			<scope>provided</scope>
 		</dependency>
 
-
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jasper</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mobicents.servlet.sip.containers</groupId>
+			<artifactId>sip-servlets-catalina-7</artifactId>
+			<scope>provided</scope>
+		</dependency>                            
 
 		<dependency>
 			<groupId>javax.servlet</groupId>