Revision: 16395
Author: baranowb
Date: Thu Jan 13 01:44:12 2011
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16395

Modified:
 /trunk/servers/jain-slee/resources/mscontrol/library/pom.xml
 /trunk/servers/jain-slee/resources/mscontrol/pom.xml
 /trunk/servers/jain-slee/resources/mscontrol/ra/pom.xml
/trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/McResourceAdaptor.java /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/MediaGroupLocal.java /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/MediaSessionLocal.java /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/NetworkConnectionLocal.java

=======================================
--- /trunk/servers/jain-slee/resources/mscontrol/library/pom.xml Wed Jan 12 11:12:16 2011 +++ /trunk/servers/jain-slee/resources/mscontrol/library/pom.xml Thu Jan 13 01:44:12 2011
@@ -1,4 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+<project
+       xmlns="http://maven.apache.org/POM/4.0.0";
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>

        <modelVersion>4.0.0</modelVersion>

@@ -21,17 +24,14 @@
                <dependency>
                        <groupId>org.mobicents.jsr309</groupId>
                        <artifactId>mobicents-jsr309-impl</artifactId>
-                       <version>2.0.0.BETA5-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>jain</groupId>
                        <artifactId>jain-mgcp-ri</artifactId>
-                       <version>1.0</version>
                </dependency>
                <dependency>
                        <groupId>org.mobicents.protocols.mgcp</groupId>
                        <artifactId>mgcp-impl</artifactId>
-                       <version>2.0.0.GA</version>
                </dependency>
        </dependencies>

=======================================
--- /trunk/servers/jain-slee/resources/mscontrol/pom.xml Wed Jan 12 11:12:16 2011 +++ /trunk/servers/jain-slee/resources/mscontrol/pom.xml Thu Jan 13 01:44:12 2011
@@ -24,9 +24,21 @@
                <docs.bookid>MsControl</docs.bookid>
         <docs.profile>mobicents</docs.profile>
         <version.concurrent>1.3.4</version.concurrent>
+ <version.mobicents.jsr309.impl>2.0.0.BETA5-SNAPSHOT</version.mobicents.jsr309.impl>
+        <version.mobicents.mgcp>2.0.0.GA</version.mobicents.mgcp>
     </properties>
     <dependencyManagement>
         <dependencies>
+               <dependency>
+                               <groupId>org.mobicents.jsr309</groupId>
+                               <artifactId>mobicents-jsr309-impl</artifactId>
+                               
<version>${version.mobicents.jsr309.impl}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.mobicents.protocols.mgcp</groupId>
+                               <artifactId>mgcp-impl</artifactId>
+                               <version>${version.mobicents.mgcp}</version>
+                       </dependency>
             <dependency>
                 <groupId>concurrent</groupId>
                 <artifactId>concurrent</artifactId>
=======================================
--- /trunk/servers/jain-slee/resources/mscontrol/ra/pom.xml Wed Jan 12 11:12:16 2011 +++ /trunk/servers/jain-slee/resources/mscontrol/ra/pom.xml Thu Jan 13 01:44:12 2011
@@ -1,8 +1,10 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
+
+<project
+       xmlns="http://maven.apache.org/POM/4.0.0";
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
                <artifactId>mobicents-slee-ra-mscontrol</artifactId>
                <groupId>org.mobicents.resources.mscontrol</groupId>
        <version>3.0.0-SNAPSHOT</version>
@@ -10,14 +12,18 @@

        <artifactId>mobicents-slee-ra-mscontrol-ra</artifactId>

-    <name>Mobicents :: Resources :: ${pom.artifactId}</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.mobicents.external.jsr309</groupId>
-            <artifactId>mscontrol</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
+       <name>Mobicents :: Resources :: ${pom.artifactId}</name>
+       <dependencies>
+               <dependency>
+                       <groupId>org.mobicents.jsr309</groupId>
+                       <artifactId>mobicents-jsr309-impl</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.mobicents.external.jsr309</groupId>
+                       <artifactId>mscontrol</artifactId>
+               </dependency>
+               <dependency>
             <groupId>${pom.groupId}</groupId>
                        
<artifactId>mobicents-slee-ra-mscontrol-ratype</artifactId>
             <version>${pom.version}</version>
@@ -27,22 +33,22 @@
                        
<artifactId>mobicents-slee-ra-mscontrol-events</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.slee</groupId>
-            <artifactId>jain-slee</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
+               <dependency>
+                       <groupId>javax.slee</groupId>
+                       <artifactId>jain-slee</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>concurrent</groupId>
+                       <artifactId>concurrent</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
+       <build>
+               <resources>
+                       <resource>
+                               
<directory>${basedir}/src/main/resources</directory>
+                               <filtering>true</filtering>
+                       </resource>
+               </resources>
+       </build>
 </project>
=======================================
--- /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/McResourceAdaptor.java Thu Jan 6 04:29:27 2011 +++ /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/McResourceAdaptor.java Thu Jan 13 01:44:12 2011
@@ -24,6 +24,7 @@
 import javax.media.mscontrol.MsControlFactory;
 import javax.media.mscontrol.resource.AllocationEvent;
 import javax.media.mscontrol.resource.AllocationEventListener;
+import javax.media.mscontrol.spi.Driver;
 import javax.media.mscontrol.spi.DriverManager;
 import javax.slee.Address;
 import javax.slee.AddressPlan;
@@ -49,8 +50,12 @@
 import javax.slee.resource.ResourceAdaptorContext;
 import javax.slee.resource.SleeEndpoint;
 import javax.slee.resource.UnrecognizedActivityHandleException;
+
+import org.mobicents.javax.media.mscontrol.spi.DriverImpl;
 import org.mobicents.slee.resource.mediacontrol.local.FactoryLocal;
+import org.mobicents.slee.resource.mediacontrol.local.MediaGroupLocal;
 import org.mobicents.slee.resource.mediacontrol.local.MsActivity;
+import org.mobicents.slee.resource.mediacontrol.local.NetworkConnectionLocal;

 /**
  *
@@ -59,6 +64,7 @@
public class McResourceAdaptor implements ResourceAdaptor, MediaEventListener, AllocationEventListener {
     //Media control factory
     private MsControlFactory mscFactory;
+    private Driver mscDriver;
     private ResourceAdaptorContext context;
     private SleeEndpoint sleeEndpoint;
     private EventLookupFacility eventLookupFacility;
@@ -134,7 +140,10 @@
tracer.info("Loading resource adaptor configuration: " + configName); config.load(this.getClass().getResourceAsStream("/" + configName));
             tracer.info("Resource adaptor successfully configured");
- mscFactory = new FactoryLocal(DriverManager.getFactory(driverName, config), this);
+            mscDriver = DriverManager.getDriver(driverName);
+ tracer.info("Created MSC Driver: "+mscDriver+", from name: "+driverName); + mscFactory = new FactoryLocal(mscDriver.getFactory(config), this);
+
             tracer.info("Successfully started driver " + driverName);
         } catch (Exception e) {
tracer.severe("Can not activate driver[" + driverName + "]", e);
@@ -145,6 +154,10 @@
     }

     public void raInactive() {
+       if(mscDriver instanceof DriverImpl)
+       {
+               ((DriverImpl)mscDriver).shutdown();
+       }
     }

public void raVerifyConfiguration(ConfigProperties config) throws InvalidConfigurationException {
@@ -290,4 +303,15 @@
     public void onEvent(AllocationEvent arg0) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
-}
+
+    //to avoid messive changes...
+       /**
+        * @param msActivty
+        */
+       public void endActivity(MsActivity msActivty) {
+               ActivityHandle ac = this.handlers.get(msActivty.getID());
+               this.sleeEndpoint.endActivity(ac);
+
+       }
+
+}
=======================================
--- /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/MediaGroupLocal.java Thu Jan 6 04:29:27 2011 +++ /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/MediaGroupLocal.java Thu Jan 13 01:44:12 2011
@@ -40,6 +40,8 @@
 import javax.media.mscontrol.resource.Action;
 import javax.media.mscontrol.resource.AllocationEventListener;

+import org.mobicents.slee.resource.mediacontrol.McResourceAdaptor;
+
 /**
  *
  * @author kulikov
@@ -52,10 +54,12 @@
     private MediaSessionLocal mediaSession;
     private PlayerLocal player;
     private RecorderLocal recorder;
-
- public MediaGroupLocal(MediaSessionLocal mediaSession, MediaGroup group) throws MsControlException {
+    private McResourceAdaptor ra;
+
+ public MediaGroupLocal(MediaSessionLocal mediaSession, MediaGroup group, McResourceAdaptor ra) throws MsControlException {
         this.group = group;
         this.mediaSession= mediaSession;
+        this.ra = ra;
         if(group.getPlayer()!=null)
this.player = new PlayerLocal(group.getPlayer(), mediaSession, this);
         if(group.getRecorder()!=null)
@@ -147,7 +151,14 @@
     }

     public void release() {
-        group.release();
+       try{
+               group.release();
+       }catch(Exception e)
+       {
+               e.printStackTrace();
+       }
+       this.ra.endActivity(this);
+
     }

     public void setParameters(Parameters parameters) {
=======================================
--- /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/MediaSessionLocal.java Thu Jan 6 04:29:27 2011 +++ /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/MediaSessionLocal.java Thu Jan 13 01:44:12 2011
@@ -73,7 +73,7 @@
     }

public MediaGroup createMediaGroup(Configuration<MediaGroup> config) throws MsControlException { - MediaGroupLocal local = new MediaGroupLocal(this, mediaSession.createMediaGroup(config)); + MediaGroupLocal local = new MediaGroupLocal(this, mediaSession.createMediaGroup(config),ra); MediaGroupActivityHandle h = new MediaGroupActivityHandle(ra, local);
         ra.createActivity(h, local);
         return local;
@@ -124,6 +124,7 @@
     }

     public void release() {
+       //BS....
        //fast solution, get proxies and release them.
 //        Iterator<MediaObject> it = this.getMediaObjects();
 //        while(it.hasNext())
=======================================
--- /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/NetworkConnectionLocal.java Tue Jan 11 08:08:34 2011 +++ /trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/NetworkConnectionLocal.java Thu Jan 13 01:44:12 2011
@@ -145,7 +145,13 @@
     }

     public void release() {
-        connection.release();
+       try{
+               connection.release();
+       }catch(Exception e)
+       {
+               e.printStackTrace();
+       }
+       this.ra.endActivity(this);
     }

     public void setParameters(Parameters p) {

Reply via email to