Revision: c13e0aa7ded0
Author:   [email protected] <[email protected]>
Date:     Thu Nov  7 15:57:05 2013 UTC
Log:      added config for BRIDGE endpoint

http://code.google.com/p/commtesting/source/detail?r=c13e0aa7ded0&repo=mss-arquillian

Modified:
/mss-arquillian-mediaserver-api/src/main/java/org/mobicents/arquillian/mediaserver/api/EndpointType.java /mss-arquillian-mediaserver-api/src/main/java/org/mobicents/arquillian/mediaserver/api/annotations/Mediaserver.java /mss-arquillian-mediaserver-extension/src/main/java/org/mobicents/arquillian/mss/mediaserver/extension/EmbeddedMediaserverImpl.java /mss-arquillian-mediaserver-extension/src/main/java/org/mobicents/arquillian/mss/mediaserver/extension/MediaServerProducer.java
 /pom.xml

=======================================
--- /mss-arquillian-mediaserver-api/src/main/java/org/mobicents/arquillian/mediaserver/api/EndpointType.java Tue Oct 23 11:17:47 2012 UTC +++ /mss-arquillian-mediaserver-api/src/main/java/org/mobicents/arquillian/mediaserver/api/EndpointType.java Thu Nov 7 15:57:05 2013 UTC
@@ -5,5 +5,5 @@
  */

 public enum EndpointType {
-       IVR, CONFERENCE, PACKETRELAY
+       IVR, CONFERENCE, PACKETRELAY, BRIDGE
 }
=======================================
--- /mss-arquillian-mediaserver-api/src/main/java/org/mobicents/arquillian/mediaserver/api/annotations/Mediaserver.java Thu Nov 8 09:48:21 2012 UTC +++ /mss-arquillian-mediaserver-api/src/main/java/org/mobicents/arquillian/mediaserver/api/annotations/Mediaserver.java Thu Nov 7 15:57:05 2013 UTC
@@ -30,6 +30,7 @@
        int IVR() default 2;
        int CONF() default 2;
        int RELAY() default 2;
+       int BRIDGE() default 2;

        //Id of the server
        String ID() default "Embedded Mediaserver";
=======================================
--- /mss-arquillian-mediaserver-extension/src/main/java/org/mobicents/arquillian/mss/mediaserver/extension/EmbeddedMediaserverImpl.java Tue Feb 12 11:54:34 2013 UTC +++ /mss-arquillian-mediaserver-extension/src/main/java/org/mobicents/arquillian/mss/mediaserver/extension/EmbeddedMediaserverImpl.java Thu Nov 7 15:57:05 2013 UTC
@@ -15,6 +15,7 @@
import org.mobicents.arquillian.mss.mediaserver.extension.mgcp.controller.ext.MgcpProviderExt;
 import org.mobicents.media.core.ResourcesPool;
 import org.mobicents.media.core.Server;
+import org.mobicents.media.core.endpoints.impl.BridgeEndpoint;
 import org.mobicents.media.core.endpoints.impl.ConferenceEndpoint;
 import org.mobicents.media.core.endpoints.impl.IvrEndpoint;
 import org.mobicents.media.core.endpoints.impl.PacketRelayEndpoint;
@@ -69,6 +70,8 @@
        private int confCounter;

        private int relayCounter;
+
+       private int bridgeCounter;

        private MediaserverStatus status;

@@ -243,6 +246,13 @@
                                installEndpoint(relay);
                        }
                        status = MediaserverStatus.CONFIGURED;
+                       break;
+               case BRIDGE:
+                       for (int i = 0; i < count; i++) {
+                               bridgeCounter++;
+ BridgeEndpoint bridge = new BridgeEndpoint("mobicents/bridge/"+relayCounter);
+                               installEndpoint(bridge);
+                       }
                        break;
                default:
                        break;
=======================================
--- /mss-arquillian-mediaserver-extension/src/main/java/org/mobicents/arquillian/mss/mediaserver/extension/MediaServerProducer.java Sun Apr 14 22:27:40 2013 UTC +++ /mss-arquillian-mediaserver-extension/src/main/java/org/mobicents/arquillian/mss/mediaserver/extension/MediaServerProducer.java Thu Nov 7 15:57:05 2013 UTC
@@ -215,6 +215,7 @@
                mediaserver.installEndpoint(EndpointType.IVR, anno.IVR());
                mediaserver.installEndpoint(EndpointType.CONFERENCE, 
anno.CONF());
                mediaserver.installEndpoint(EndpointType.PACKETRELAY, 
anno.RELAY());
+               mediaserver.installEndpoint(EndpointType.BRIDGE, anno.BRIDGE());

                if(anno.ID() != null){
                        mediaserver.setId(anno.ID());
=======================================
--- /pom.xml    Sat Mar 30 23:32:52 2013 UTC
+++ /pom.xml    Thu Nov  7 15:57:05 2013 UTC
@@ -336,7 +336,6 @@
                <module>mss-arquillian-container-extension</module>
                <module>mss-arquillian-utilities-extension</module>
                <module>mss-arquillian-showcase</module>
-               <module>mss-arquillian-docs</module>
                <module>mss-arquillian-mediaserver-api</module>
                <module>mss-arquillian-mediaserver-extension</module>
        </modules>

--

--- You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to