Revision: 20596
Author: [email protected]
Date: Mon Sep 26 07:10:51 2011
Log: Fixes issue 2890
http://code.google.com/p/mobicents/source/detail?r=20596
Modified:
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.classpath
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.project
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.settings/org.eclipse.jdt.core.prefs
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/pom.xml
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/src/main/java/org/mobicents/servlet/sip/ctf/core/environment/msstomcat7/SipWeldInstanceManager.java
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/.classpath
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/.project
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/.settings/org.eclipse.jdt.core.prefs
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/SipRegistration/pom.xml
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-jsf2/pom.xml
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet25-cdi/.classpath
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet25-cdi/pom.xml
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet3.0-cdi/pom.xml
/trunk/frameworks/sip-servlets/cdi-telco-framework/modules/ctf-sip-servlets/.classpath
/trunk/frameworks/sip-servlets/cdi-telco-framework/modules/ctf-sip-servlets/.settings/org.eclipse.jdt.core.prefs
/trunk/frameworks/sip-servlets/cdi-telco-framework/pom.xml
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.classpath
Fri Sep 9 07:52:20 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.classpath
Mon Sep 26 07:10:51 2011
@@ -1,31 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src"
path="src/main/resources"/>
- <classpathentry kind="var"
path="M2_REPO/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.jar"
sourcepath="M2_REPO/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1-sources.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/annotations-api/6.0.32/annotations-api-6.0.32.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/catalina/6.0.32/catalina-6.0.32.jar"/>
- <classpathentry kind="src" path="/ctf-core-extension"/>
- <classpathentry kind="var"
path="M2_REPO/geronimo-spec/geronimo-spec-j2ee-jacc/1.0-rc4/geronimo-spec-j2ee-jacc-1.0-rc4.jar"/>
- <classpathentry kind="var"
path="M2_REPO/jboss/web/jbossweb/2.1.3.GA/jbossweb-2.1.3.GA.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/juli/6.0.32/juli-6.0.32.jar"/>
- <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/servlet-api/6.0.32/servlet-api-6.0.32.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-jboss5/1.6.0.FINAL/sip-servlets-jboss5-1.6.0.FINAL.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-tomcat-7/2.0.0.ALPHA2/sip-servlets-tomcat-7-2.0.0.ALPHA2.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-annotations-api/7.0.8/tomcat-annotations-api-7.0.8.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-api/7.0.8/tomcat-api-7.0.8.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-catalina/7.0.8/tomcat-catalina-7.0.8.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-juli/7.0.8/tomcat-juli-7.0.8.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-servlet-api/7.0.8/tomcat-servlet-api-7.0.8.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-util/7.0.8/tomcat-util-7.0.8.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.2.Final/weld-servlet-1.1.2.Final.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-tomcat-jboss4/1.7.0-SNAPSHOT/sip-servlets-tomcat-jboss4-1.7.0-SNAPSHOT.jar"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-core-api"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-client"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-impl"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-catalina"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/sip-servlets-spec"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.jar"
sourcepath="M2_REPO/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1-sources.jar"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/annotations-api/6.0.32/annotations-api-6.0.32.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/catalina/6.0.32/catalina-6.0.32.jar"/>
+ <classpathentry kind="src" path="/ctf-core-extension"/>
+ <classpathentry kind="var"
path="M2_REPO/jboss/web/jbossweb/2.1.3.GA/jbossweb-2.1.3.GA.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/juli/6.0.32/juli-6.0.32.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/servlet-api/6.0.32/servlet-api-6.0.32.jar"/>
+ <classpathentry kind="src" path="/sip-servlets-annotations"/>
+ <classpathentry kind="src" path="/sip-servlets-catalina-7"/>
+ <classpathentry kind="src" path="/sip-servlets-client"/>
+ <classpathentry kind="src" path="/sip-servlets-core-api"/>
+ <classpathentry kind="src" path="/sip-servlets-impl"/>
+ <classpathentry kind="src" path="/sip-servlets-jboss-5"/>
+ <classpathentry kind="src" path="/sip-servlets-jruby"/>
+ <classpathentry kind="src" path="/sip-servlets-spec"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-tomcat-jboss4/1.7.0-SNAPSHOT/sip-servlets-tomcat-jboss4-1.7.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-annotations-api/7.0.8/tomcat-annotations-api-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-api/7.0.8/tomcat-api-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-catalina/7.0.8/tomcat-catalina-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-juli/7.0.8/tomcat-juli-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-servlet-api/7.0.8/tomcat-servlet-api-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-util/7.0.8/tomcat-util-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.2.Final/weld-servlet-1.1.2.Final.jar"
sourcepath="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.2.Final/weld-servlet-1.1.2.Final-sources.jar"/>
</classpath>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.project
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.project
Mon Sep 26 07:10:51 2011
@@ -3,7 +3,14 @@
<comment>Mobicents :: Parent pom for 2.x releases. NO_M2ECLIPSE_SUPPORT:
Project files created with the maven-eclipse-plugin are not supported in
M2Eclipse.</comment>
<projects>
<project>ctf-core-extension</project>
- <project>sip-servlets-tomcat-jboss4</project>
+ <project>sip-servlets-annotations</project>
+ <project>sip-servlets-catalina-7</project>
+ <project>sip-servlets-client</project>
+ <project>sip-servlets-core-api</project>
+ <project>sip-servlets-impl</project>
+ <project>sip-servlets-jboss-5</project>
+ <project>sip-servlets-jruby</project>
+ <project>sip-servlets-spec</project>
</projects>
<buildSpec>
<buildCommand>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.settings/org.eclipse.jdt.core.prefs
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.settings/org.eclipse.jdt.core.prefs
Mon Sep 26 07:10:51 2011
@@ -1,4 +1,4 @@
-#Thu Sep 01 14:34:48 EEST 2011
+#Mon Sep 26 17:06:52 EEST 2011
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.6
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/pom.xml
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/pom.xml
Mon Sep 26 07:10:51 2011
@@ -42,16 +42,22 @@
<!-- Mobicents Dependencies -->
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
- <artifactId>sip-servlets-tomcat-7</artifactId>
+ <artifactId>sip-servlets-tomcat-jboss4</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
- <artifactId>sip-servlets-tomcat-jboss4</artifactId>
+ <artifactId>sip-servlets-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.mobicents.servlet.sip</groupId>
+ <artifactId>sip-servlets-catalina-7</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- CTF Extension artifact -->
<dependency>
<groupId>org.mobicents.servlet.sip.ctf.core</groupId>
@@ -60,11 +66,7 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.mobicents.servlet.sip</groupId>
- <artifactId>sip-servlets-impl</artifactId>
- <scope>provided</scope>
- </dependency>
+
<!-- Tomcat 7 Dependencies -->
<dependency>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/src/main/java/org/mobicents/servlet/sip/ctf/core/environment/msstomcat7/SipWeldInstanceManager.java
Fri Sep 9 07:52:20 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/src/main/java/org/mobicents/servlet/sip/ctf/core/environment/msstomcat7/SipWeldInstanceManager.java
Mon Sep 26 07:10:51 2011
@@ -10,6 +10,7 @@
import org.jboss.weld.manager.api.WeldManager;
import org.mobicents.servlet.sip.catalina.annotations.SipInstanceManager;
+
public class SipWeldInstanceManager extends AbstractInjector implements
SipInstanceManager {
public SipWeldInstanceManager(WeldManager manager) {
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/.classpath
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/.classpath
Mon Sep 26 07:10:51 2011
@@ -4,6 +4,6 @@
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"
sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-spec/2.0.0.ALPHA2/sip-servlets-spec-2.0.0.ALPHA2.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.2.Final/weld-servlet-1.1.2.Final.jar"/>
+ <classpathentry kind="src" path="/sip-servlets-spec"/>
+ <classpathentry kind="var"
path="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.2.Final/weld-servlet-1.1.2.Final.jar"
sourcepath="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.2.Final/weld-servlet-1.1.2.Final-sources.jar"/>
</classpath>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/.project
Wed Jul 13 10:35:16 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/.project
Mon Sep 26 07:10:51 2011
@@ -1,7 +1,9 @@
<projectDescription>
<name>ctf-core-extension</name>
<comment>Mobicents :: Parent pom for 2.x releases. NO_M2ECLIPSE_SUPPORT:
Project files created with the maven-eclipse-plugin are not supported in
M2Eclipse.</comment>
- <projects/>
+ <projects>
+ <project>sip-servlets-spec</project>
+ </projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/.settings/org.eclipse.jdt.core.prefs
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/.settings/org.eclipse.jdt.core.prefs
Mon Sep 26 07:10:51 2011
@@ -1,4 +1,4 @@
-#Sat Aug 06 15:44:18 EEST 2011
+#Mon Sep 26 11:27:36 EEST 2011
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/SipRegistration/pom.xml
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/SipRegistration/pom.xml
Mon Sep 26 07:10:51 2011
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-spec</artifactId>
- <version>${mss1.version}</version>
+ <version>${mss.version}</version>
<scope>provided</scope>
</dependency>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-jsf2/pom.xml
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-jsf2/pom.xml
Mon Sep 26 07:10:51 2011
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-spec</artifactId>
- <version>${mss2.version}</version>
+ <version>${mss.version}</version>
<scope>provided</scope>
</dependency>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet25-cdi/.classpath
Wed Aug 3 03:32:02 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet25-cdi/.classpath
Mon Sep 26 07:10:51 2011
@@ -1,11 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"
sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/ctf/core/ctf-core/1.0.0-SNAPSHOT/ctf-core-1.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/ctf/core/ctf-core-extension/1.0.0-SNAPSHOT/ctf-core-extension-1.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-spec/1.5.0.FINAL/sip-servlets-spec-1.5.0.FINAL.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.0.Final/weld-servlet-1.1.0.Final.jar"
sourcepath="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.0.Final/weld-servlet-1.1.0.Final-sources.jar"/>
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"
sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/ctf/core/ctf-core/1.0.0-SNAPSHOT/ctf-core-1.0.0-SNAPSHOT.jar"
sourcepath="/ECLIPSE_HOME/localWorkspace/cdi-telco-framework/core/ctf-core"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/ctf/core/ctf-core-extension/1.0.0-SNAPSHOT/ctf-core-extension-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-spec/1.5.0.FINAL/sip-servlets-spec-1.5.0.FINAL.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.0.Final/weld-servlet-1.1.0.Final.jar"
sourcepath="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.0.Final/weld-servlet-1.1.0.Final-sources.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet25-cdi/pom.xml
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet25-cdi/pom.xml
Mon Sep 26 07:10:51 2011
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-spec</artifactId>
- <version>${mss1.version}</version>
+ <version>${mss.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet3.0-cdi/pom.xml
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet3.0-cdi/pom.xml
Mon Sep 26 07:10:51 2011
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-spec</artifactId>
- <version>${mss2.version}</version>
+ <version>${mss.version}</version>
<scope>provided</scope>
</dependency>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/modules/ctf-sip-servlets/.classpath
Tue Aug 2 10:59:16 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/modules/ctf-sip-servlets/.classpath
Mon Sep 26 07:10:51 2011
@@ -3,5 +3,5 @@
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"
sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
</classpath>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/modules/ctf-sip-servlets/.settings/org.eclipse.jdt.core.prefs
Mon Sep 5 11:04:14 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/modules/ctf-sip-servlets/.settings/org.eclipse.jdt.core.prefs
Mon Sep 26 07:10:51 2011
@@ -1,4 +1,4 @@
-#Tue Aug 02 22:51:22 EEST 2011
+#Mon Sep 26 11:27:38 EEST 2011
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
=======================================
--- /trunk/frameworks/sip-servlets/cdi-telco-framework/pom.xml Mon Sep 5
11:04:14 2011
+++ /trunk/frameworks/sip-servlets/cdi-telco-framework/pom.xml Mon Sep 26
07:10:51 2011
@@ -56,9 +56,8 @@
<tomcat6.version>6.0.32</tomcat6.version>
<jboss5.version>5.1.0.GA</jboss5.version>
- <mss1.version>1.6.0.FINAL</mss1.version>
- <mss2.version>2.0.0.ALPHA2</mss2.version>
-
+ <mss.version>1.7.0-SNAPSHOT</mss.version>
+
<weld.version>1.1.2.Final</weld.version>
<cdiapi.version>1.0</cdiapi.version>
</properties>
@@ -122,41 +121,41 @@
</dependency>
<!-- Mobicents Dependencies -->
- <dependency>
- <groupId>org.mobicents.servlet.sip</groupId>
- <artifactId>sip-servlets-tomcat-7</artifactId>
- <version>${mss2.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-impl</artifactId>
- <version>${mss2.version}</version>
+ <version>${mss.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-jboss5</artifactId>
- <version>${mss1.version}</version>
+ <version>${mss.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-tomcat-jboss4</artifactId>
- <version>${mss1.version}</version>
+ <version>${mss.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-spec</artifactId>
- <version>${mss2.version}</version>
+ <version>${mss.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.mobicents.servlet.sip</groupId>
+ <artifactId>sip-servlets-catalina-7</artifactId>
+ <version>${mss.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- CTF dependencies for examples -->
<dependency>
<groupId>org.mobicents.servlet.sip.ctf.core</groupId>
