Revision: 22775
Author:   gvagenas
Date:     Wed Aug  1 05:41:23 2012
Log:      Chages

http://code.google.com/p/mobicents/source/detail?r=22775

Deleted:
/trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet3.0-cdi/src/main/java/org/mobicents/servlet/sip/weld
Modified:
 /trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.classpath
 /trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/pom.xml
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/src/main/java/org/mobicents/servlet/sip/ctf/core/extension/SipServletsEntryPoint.java /trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet3.0-cdi/src/main/java/org/mobicents/servlet/sip/ctf/examples/SimpleSipServlet.java
 /trunk/frameworks/sip-servlets/cdi-telco-framework/pom.xml

=======================================
--- /trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.classpath Mon Sep 26 07:10:51 2011 +++ /trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/.classpath Wed Aug 1 05:41:23 2012
@@ -1,30 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <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"/>
+       <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/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-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"/> + <classpathentry combineaccessrules="false" kind="src" path="/sip-servlets-jboss5"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>
=======================================
--- /trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/pom.xml Mon Sep 26 07:10:51 2011 +++ /trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core/pom.xml Wed Aug 1 05:41:23 2012
@@ -41,7 +41,7 @@

                <!-- Mobicents Dependencies -->
                <dependency>
-                       <groupId>org.mobicents.servlet.sip</groupId>
+                       <groupId>org.mobicents.servlet.sip.containers</groupId>
                        <artifactId>sip-servlets-tomcat-jboss4</artifactId>
                        <scope>provided</scope>
                </dependency>
@@ -53,7 +53,7 @@
                </dependency>

                <dependency>
-                       <groupId>org.mobicents.servlet.sip</groupId>
+                       <groupId>org.mobicents.servlet.sip.containers</groupId>
                        <artifactId>sip-servlets-catalina-7</artifactId>
                        <scope>provided</scope>
                </dependency>
@@ -84,7 +84,7 @@

                <!-- JBoss5 Dependencies -->
                <dependency>
-                       <groupId>org.mobicents.servlet.sip</groupId>
+                       <groupId>org.mobicents.servlet.sip.containers</groupId>
                        <artifactId>sip-servlets-jboss5</artifactId>
                        <scope>provided</scope>
                </dependency>
=======================================
--- /trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/src/main/java/org/mobicents/servlet/sip/ctf/core/extension/SipServletsEntryPoint.java Fri Jul 15 00:33:10 2011 +++ /trunk/frameworks/sip-servlets/cdi-telco-framework/core/ctf-core-extension/src/main/java/org/mobicents/servlet/sip/ctf/core/extension/SipServletsEntryPoint.java Wed Aug 1 05:41:23 2012
@@ -3,15 +3,19 @@
import static org.jboss.weld.logging.messages.ServletMessage.ONLY_HTTP_SERVLET_LIFECYCLE_DEFINED;

 import java.io.IOException;
+import java.util.Set;

 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ObserverMethod;
 import javax.inject.Inject;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.sip.SipErrorEvent;
 import javax.servlet.sip.SipErrorListener;
 import javax.servlet.sip.SipServlet;
+import javax.servlet.sip.SipServletContextEvent;
+import javax.servlet.sip.SipServletListener;
 import javax.servlet.sip.SipServletMessage;
 import javax.servlet.sip.SipServletRequest;
 import javax.servlet.sip.SipServletResponse;
@@ -23,6 +27,7 @@
import org.mobicents.servlet.sip.ctf.core.extension.context.sip.SipSessionContext; import org.mobicents.servlet.sip.ctf.core.extension.event.error.literal.NoAckReceivedLiteral; import org.mobicents.servlet.sip.ctf.core.extension.event.error.literal.NoPrackReceivedLiteral;
+import org.mobicents.servlet.sip.ctf.core.extension.event.request.Invite;
import org.mobicents.servlet.sip.ctf.core.extension.event.request.literal.AckLiteral; import org.mobicents.servlet.sip.ctf.core.extension.event.request.literal.ByeLiteral; import org.mobicents.servlet.sip.ctf.core.extension.event.request.literal.CancelLiteral;
@@ -43,6 +48,7 @@
import org.mobicents.servlet.sip.ctf.core.extension.event.response.literal.RedirectResponseLiteral; import org.mobicents.servlet.sip.ctf.core.extension.event.response.literal.ResponseLiteral; import org.mobicents.servlet.sip.ctf.core.extension.event.response.literal.SuccessResponseLiteral; +import org.mobicents.servlet.sip.ctf.core.extension.event.servlet.literal.ServletInitializedLiteral; import org.mobicents.servlet.sip.ctf.core.extension.event.session.literal.SipApplicationSessionLiteral; import org.mobicents.servlet.sip.ctf.core.extension.event.session.literal.SipSessionLiteral; import org.mobicents.servlet.sip.ctf.core.extension.sessionlisteners.SipApplicationSessionContextInitialization;
@@ -58,8 +64,8 @@

 @ApplicationScoped
 @javax.servlet.sip.annotation.SipServlet(loadOnStartup=1)
-public class SipServletsEntryPoint extends SipServlet implements SipErrorListener{
-
+public class SipServletsEntryPoint extends SipServlet implements SipErrorListener
+{
        private static final long serialVersionUID = 1L;

 //     private transient SipSessionContext sipSessionContext;
@@ -126,7 +132,7 @@

                if (sipMethod.equalsIgnoreCase("INVITE"))
                        beanManager.fireEvent(req, InviteLiteral.INSTANCE);
-
+
                if (sipMethod.equalsIgnoreCase("ACK"))
                        beanManager.fireEvent(req, AckLiteral.INSTANCE);

=======================================
--- /trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet3.0-cdi/src/main/java/org/mobicents/servlet/sip/ctf/examples/SimpleSipServlet.java Mon Sep 5 11:04:14 2011 +++ /trunk/frameworks/sip-servlets/cdi-telco-framework/examples/click2call-servlet3.0-cdi/src/main/java/org/mobicents/servlet/sip/ctf/examples/SimpleSipServlet.java Wed Aug 1 05:41:23 2012
@@ -53,7 +53,7 @@
         */

        //SipFactory injection
-       @Resource
+       @Inject
        private SipFactory sipFactory;

        //sipRegistar will process the Registration request
=======================================
--- /trunk/frameworks/sip-servlets/cdi-telco-framework/pom.xml Mon Sep 26 07:10:51 2011 +++ /trunk/frameworks/sip-servlets/cdi-telco-framework/pom.xml Wed Aug 1 05:41:23 2012
@@ -56,8 +56,8 @@
                <tomcat6.version>6.0.32</tomcat6.version>
                <jboss5.version>5.1.0.GA</jboss5.version>

-               <mss.version>1.7.0-SNAPSHOT</mss.version>
-
+               <mss.version>1.7.0.FINAL</mss.version>
+
                <weld.version>1.1.2.Final</weld.version>
                <cdiapi.version>1.0</cdiapi.version>
        </properties>
@@ -129,14 +129,14 @@
                        </dependency>

                        <dependency>
-                               <groupId>org.mobicents.servlet.sip</groupId>
+                               
<groupId>org.mobicents.servlet.sip.containers</groupId>
                                <artifactId>sip-servlets-jboss5</artifactId>
                                <version>${mss.version}</version>
                                <scope>provided</scope>
                        </dependency>

                        <dependency>
-                               <groupId>org.mobicents.servlet.sip</groupId>
+                               
<groupId>org.mobicents.servlet.sip.containers</groupId>
                                
<artifactId>sip-servlets-tomcat-jboss4</artifactId>
                                <version>${mss.version}</version>
                                <scope>provided</scope>
@@ -149,12 +149,12 @@
                                <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>
+                       <dependency>
+                               
<groupId>org.mobicents.servlet.sip.containers</groupId>
+                               <artifactId>sip-servlets-catalina-7</artifactId>
+                               <version>${mss.version}</version>
+                               <scope>provided</scope>
+                       </dependency>

                        <!-- CTF dependencies for examples -->
                        <dependency>
@@ -269,6 +269,19 @@
                                <updatePolicy>never</updatePolicy>
                        </snapshots>
                </repository>
+
+               <repository>
+                       <id>mobicents-releases-repository</id>
+                       <name>Mobicents Releases Repository</name>
+                       
<url>https://oss.sonatype.org/content/repositories/releases/</url>
+               </repository>
+
+               <repository>
+                       <id>mobicents-snapshots-repository</id>
+                       <name>Mobicents Releases Repository</name>
+                       
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+               </repository>
+
        </repositories>

 </project>

Reply via email to