[mobicents] r9847 committed - Update Issue 1121...

Mon, 01 Feb 2010 16:53:49 -0800 

Revision: 9847
Author: vladimir.ralev
Date: Mon Feb  1 16:52:59 2010
Log: Update Issue 1121
Summary: Remove completely startup media dependencies

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

Modified:
/trunk/frameworks/sip-servlets/seam-telco-framework/entrypoint/src/main/java/org/mobicents/servlet/sip/seam/entrypoint/SeamEntryPointServlet.java /trunk/frameworks/sip-servlets/seam-telco-framework/entrypoint/src/main/java/org/mobicents/servlet/sip/seam/entrypoint/media/EventFactory.java /trunk/frameworks/sip-servlets/seam-telco-framework/entrypoint/src/main/java/org/mobicents/servlet/sip/seam/entrypoint/media/MsProviderContainer.java 

=======================================
--- /trunk/frameworks/sip-servlets/seam-telco-framework/entrypoint/src/main/java/org/mobicents/servlet/sip/seam/entrypoint/SeamEntryPointServlet.java Thu Jun 25 16:15:57 2009 +++ /trunk/frameworks/sip-servlets/seam-telco-framework/entrypoint/src/main/java/org/mobicents/servlet/sip/seam/entrypoint/SeamEntryPointServlet.java Mon Feb 1 16:52:59 2010 
@@ -31,13 +31,16 @@
                Thread t = new Thread() {
                        @Override
                        public void run() {
- arg0.getSession().setAttribute("msSession", MsProviderContainer.msProvider.createSession()); 
+                               if(MsProviderContainer.msProvider != null)
+ arg0.getSession().setAttribute("msSession", MsProviderContainer.msProvider.createSession()); 
                                arg0.getSession().setAttribute("sipSession", 
arg0.getSession());
                                Lifecycle.beginSession(new 
SipSeamSessionMap(arg0.getSession()));
                                
SeamEntrypointUtils.beginEvent(arg0.getSession());
                                Contexts.getSessionContext().set("sipSession", 
arg0.getSession());
- Contexts.getSessionContext().set("msSession", MsProviderContainer.msProvider.createSession()); - Contexts.getApplicationContext().set("eventFactory", MsProviderContainer.msProvider.getEventFactory()); 
+                               if(MsProviderContainer.msProvider != null) {
+ Contexts.getSessionContext().set("msSession", MsProviderContainer.msProvider.createSession()); + Contexts.getApplicationContext().set("eventFactory", MsProviderContainer.msProvider.getEventFactory()); 
+                               }

                                
Events.instance().raiseEvent("sipSessionCreated", arg0.getSession());
                                SeamEntrypointUtils.endEvent();
=======================================
--- /trunk/frameworks/sip-servlets/seam-telco-framework/entrypoint/src/main/java/org/mobicents/servlet/sip/seam/entrypoint/media/EventFactory.java Wed Apr 8 14:23:22 2009 +++ /trunk/frameworks/sip-servlets/seam-telco-framework/entrypoint/src/main/java/org/mobicents/servlet/sip/seam/entrypoint/media/EventFactory.java Mon Feb 1 16:52:59 2010 
@@ -13,6 +13,7 @@
 public class EventFactory {
        @Unwrap
        public MsEventFactory getFactroy() {
+               if(MsProviderContainer.msProvider == null) return null;
                return MsProviderContainer.msProvider.getEventFactory();

        }
=======================================
--- /trunk/frameworks/sip-servlets/seam-telco-framework/entrypoint/src/main/java/org/mobicents/servlet/sip/seam/entrypoint/media/MsProviderContainer.java Wed Apr 8 14:23:22 2009 +++ /trunk/frameworks/sip-servlets/seam-telco-framework/entrypoint/src/main/java/org/mobicents/servlet/sip/seam/entrypoint/media/MsProviderContainer.java Mon Feb 1 16:52:59 2010 
@@ -1,5 +1,7 @@
 package org.mobicents.servlet.sip.seam.entrypoint.media;

+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
 import org.mobicents.mscontrol.MsProvider;
 import org.mobicents.mscontrol.impl.MsProviderImpl;

@@ -9,5 +11,15 @@
  *
  */
 public class MsProviderContainer {
-       public static MsProvider msProvider = new MsProviderImpl();
-}
+ private static LogProvider log = Logging.getLogProvider(MsProviderContainer.class); 
+       public static MsProvider msProvider;
+       static {
+               try {
+               msProvider = new MsProviderImpl();
+               } catch (Throwable t) {
+ log.warn("Can not find Media Server 1.x.y. Media will not be available for" + 
+                                       " this application. Media is only available 
in Mobicents with " +
+                                       "JBoss AS 4.2.x");
+               }
+       }
+}

Reply via email to