Revision: 16407
Author: [email protected]
Date: Thu Jan 13 05:29:21 2011
Log: Updating files for renaming the click to call async app name and fixing the release build to ship it by default
http://code.google.com/p/mobicents/source/detail?r=16407

Added:
/branches/servers/sip-servlets/2.0/sip-servlets-bootstrap/src/site/resources/click2call-async-dar.properties /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call/click2call-dar.properties /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/click2call-async-dar.properties
Modified:
 /branches/servers/sip-servlets/2.0/sip-servlets-bootstrap/release/build.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleSipServlet.java /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleWebServlet.java /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/StatusServlet.java /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/package-info.java

=======================================
--- /dev/null
+++ /branches/servers/sip-servlets/2.0/sip-servlets-bootstrap/src/site/resources/click2call-async-dar.properties Thu Jan 13 05:29:21 2011
@@ -0,0 +1,2 @@
+OPTIONS: ("ClickToCallAsyncApplication", "DAR:From", "ORIGINATING", "", "NO_ROUTE", "0") +REGISTER: ("ClickToCallAsyncApplication", "DAR:From", "ORIGINATING", "", "NO_ROUTE", "0")
=======================================
--- /dev/null
+++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call/click2call-dar.properties Thu Jan 13 05:29:21 2011
@@ -0,0 +1,2 @@
+OPTIONS: ("org.mobicents.servlet.sip.example.SimpleApplication", "DAR:From", "ORIGINATING", "", "NO_ROUTE", "0") +REGISTER: ("org.mobicents.servlet.sip.example.SimpleApplication", "DAR:From", "ORIGINATING", "", "NO_ROUTE", "0")
=======================================
--- /dev/null
+++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/click2call-async-dar.properties Thu Jan 13 05:29:21 2011
@@ -0,0 +1,2 @@
+OPTIONS: ("ClickToCallAsyncApplication", "DAR:From", "ORIGINATING", "", "NO_ROUTE", "0") +REGISTER: ("ClickToCallAsyncApplication", "DAR:From", "ORIGINATING", "", "NO_ROUTE", "0")
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-bootstrap/release/build.xml Thu Jan 13 02:00:51 2011 +++ /branches/servers/sip-servlets/2.0/sip-servlets-bootstrap/release/build.xml Thu Jan 13 05:29:21 2011
@@ -73,7 +73,7 @@
                <copy file="TOMCAT-SIP-SERVLETS-README.txt" todir="${tomcat.home}" 
/>

                <mkdir dir="${tomcat.home}/conf/dars"/>
- <copy file="${base.path}/../src/site/resources/click2call-dar.properties" tofile="${tomcat.home}/conf/dars/mobicents-dar.properties" /> + <copy file="${base.path}/../src/site/resources/click2call-async-dar.properties" tofile="${tomcat.home}/conf/dars/mobicents-dar.properties" />

<copy file="${base.path}/server-tomcat-7.xml" tofile="${tomcat.home}/conf/server.xml" /> <copy file="${base.path}/mss-sip-stack.properties" tofile="${tomcat.home}/conf/mss-sip-stack.properties" />
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleSipServlet.java Thu Jan 13 03:44:12 2011 +++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleSipServlet.java Thu Jan 13 05:29:21 2011
@@ -41,7 +41,7 @@

 import org.apache.log4j.Logger;

[email protected](loadOnStartup=1, applicationName="org.mobicents.servlet.sip.example.SimpleAsyncApplication") [email protected](loadOnStartup=1, applicationName="ClickToCallAsyncApplication")
 @SipListener
public class SimpleSipServlet extends SipServlet implements SipErrorListener,
                Servlet {
@@ -62,7 +62,7 @@
                        Properties jndiProps = new Properties();
                        Context initCtx = new InitialContext(jndiProps);
                        Context envCtx = (Context) 
initCtx.lookup("java:comp/env");
- sipFactory = (SipFactory) envCtx.lookup("sip/org.mobicents.servlet.sip.example.SimpleAsyncApplication/SipFactory"); + sipFactory = (SipFactory) envCtx.lookup("sip/ClickToCallAsyncApplication/SipFactory");
                        logger.info("Sip Factory ref from JNDI : " + 
sipFactory);
                } catch (NamingException e) {
                        throw new ServletException("Uh oh -- JNDI problem !", 
e);
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleWebServlet.java Thu Jan 13 03:44:12 2011 +++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleWebServlet.java Thu Jan 13 05:29:21 2011
@@ -57,7 +57,7 @@
                        Properties jndiProps = new Properties();
                        Context initCtx = new InitialContext(jndiProps);
                        Context envCtx = (Context) 
initCtx.lookup("java:comp/env");
- sipFactory = (SipFactory) envCtx.lookup("sip/org.mobicents.servlet.sip.example.SimpleAsyncApplication/SipFactory"); + sipFactory = (SipFactory) envCtx.lookup("sip/ClickToCallAsyncApplication/SipFactory");
                        logger.info("Sip Factory ref from JNDI : " + 
sipFactory);
                } catch (NamingException e) {
                        throw new ServletException("Uh oh -- JNDI problem !", 
e);
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/StatusServlet.java Thu Jan 13 03:44:12 2011 +++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/StatusServlet.java Thu Jan 13 05:29:21 2011
@@ -2,13 +2,11 @@

 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Queue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledThreadPoolExecutor;

 import javax.servlet.AsyncContext;
 import javax.servlet.AsyncEvent;
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/package-info.java Fri Jan 7 10:14:30 2011 +++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/package-info.java Thu Jan 13 05:29:21 2011
@@ -1,3 +1,3 @@
-@SipApplication(name="org.mobicents.servlet.sip.example.SimpleAsyncApplication", displayName="SimpleAsyncApplication") +@SipApplication(name="ClickToCallAsyncApplication", displayName="ClickToCallAsyncApplication")
 package org.mobicents.servlet.sip.example;
 import javax.servlet.sip.annotation.SipApplication;

Reply via email to