Update Issue 1887

Updating poms

git-svn-id: https://mobicents.googlecode.com/svn/trunk/servers/sip-servlets@20216 bf0df8d0-2c1f-0410-b170-bd30377b63dc

Author: jean.deruelle@gmail.com

sip-servlets-catalina/pom.xml

@@ -11,17 +11,35 @@
 	<name>Mobicents Sip Servlets Catalina Abstract Layer</name>
 	<url>http://www.mobicents.org/products_sip_servlets.html</url>
 	<dependencies>
-		<!-- sip servlet spec dependency -->
+		<!-- sip servlets dependency -->
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-spec</artifactId>
 			<version>1.7.0-SNAPSHOT</version>			
 		</dependency>
+		<dependency>
+			<groupId>org.mobicents.servlet.sip</groupId>
+			<artifactId>sip-servlets-impl</artifactId>
+			<version>1.7.0-SNAPSHOT</version>			
+		</dependency>
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-core-api</artifactId>
 			<version>1.7.0-SNAPSHOT</version>			
 		</dependency>
+		<dependency>
+			<groupId>javax.sip</groupId>
+			<artifactId>jain-sip-api</artifactId>
+			<version>${jain-sip-api.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.sip</groupId>
+			<artifactId>jain-sip-ri</artifactId>
+			<version>${jain-sip-ri.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<!-- logging dependency -->
 		<dependency>
 			<groupId>log4j</groupId>
@@ -44,6 +62,26 @@
 			<version>${tomcat.version}</version>
 			<scope>provided</scope>
 		</dependency>	
+<!-- mobicents sip stack extensions deps -->
+		<dependency>			
+			<groupId>org.mobicents.ha.javax.sip</groupId>
+			<artifactId>mobicents-jain-sip-ha-core</artifactId>
+			<version>${mobicents.jain.sip.ha.version}</version>	
+			<scope>provided</scope>
+		</dependency>
+		
+		<dependency>			
+			<groupId>org.mobicents.javax.sip</groupId>
+			<artifactId>mobicents-jain-sip-ext</artifactId>
+			<version>${mobicents.jain.sip.ext.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.java.stun4j</groupId>
+			<artifactId>stun4j</artifactId>
+			<version>1.0.MOBICENTS</version>
+			<scope>provided</scope>
+		</dependency>	
 	</dependencies>
 	<build>
 		<plugins>		

sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/CatalinaSipContext.java

@@ -23,7 +23,6 @@
 package org.mobicents.servlet.sip.catalina;
 
 import org.apache.AnnotationProcessor;
-import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.mobicents.servlet.sip.core.SipContext;
 

sip-servlets-jboss5/pom.xml

@@ -50,6 +50,13 @@
 			<version>1.7.0-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.mobicents.servlet.sip</groupId>
+			<artifactId>sip-servlets-catalina</artifactId>
+			<version>1.7.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>

sip-servlets-test-suite/.classpath

@@ -67,7 +67,7 @@
 	<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.2/cglib-nodep-2.2.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jain-sip"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jain-sip-ext"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-catalina"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-core-api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-catalina"/>
 	<classpathentry kind="output" path="testsuite/target/test-classes"/>
 </classpath>

sip-servlets-tomcat-jboss4/pom.xml

@@ -40,7 +40,14 @@
 			<version>1.7.0-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>	
-		
+
+		<dependency>
+			<groupId>org.mobicents.servlet.sip</groupId>
+			<artifactId>sip-servlets-catalina</artifactId>
+			<version>1.7.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>	
+				
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-annotations</artifactId>