Revision: 16056
Author: oleg.kulikoff
Date: Sun Dec 26 23:48:09 2010
Log: Issue 1976: Separate PA action
http://code.google.com/p/mobicents/source/detail?r=16056

Added:
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/Action.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayAnnouncement.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/jsr309/mgcp/PackageAU.java
Deleted:
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/Request.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/jsr309/mgcp/MgcpStackFactory.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/jsr309/mgcp/MgcpWrapper.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/jsr309/mgcp/Provider.java
Modified:
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/XMLParser.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/MediaGroupImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mixer/MediaMixerImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/vxml/VxmlDialogImpl.java

=======================================
--- /dev/null
+++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/Action.java Sun Dec 26 23:48:09 2010
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.mobicents.javax.media.mscontrol.mediagroup;
+
+import jain.protocol.ip.mgcp.JainMgcpListener;
+import jain.protocol.ip.mgcp.pkg.PackageName;
+
+/**
+ * Defines media group action.
+ *
+ * @author kulikov
+ */
+public interface Action extends JainMgcpListener {
+    public PackageName AU = PackageName.factory("AU");
+    /**
+     * Triggers action execution.
+     */
+    public void execute();
+}
=======================================
--- /dev/null
+++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayAnnouncement.java Sun Dec 26 23:48:09 2010
@@ -0,0 +1,145 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.mobicents.javax.media.mscontrol.mediagroup;
+
+import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
+import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
+import jain.protocol.ip.mgcp.message.Constants;
+import jain.protocol.ip.mgcp.message.NotificationRequest;
+import jain.protocol.ip.mgcp.message.NotificationRequestResponse;
+import jain.protocol.ip.mgcp.message.Notify;
+import jain.protocol.ip.mgcp.message.parms.ConnectionIdentifier;
+import jain.protocol.ip.mgcp.message.parms.EventName;
+import jain.protocol.ip.mgcp.message.parms.RequestIdentifier;
+import jain.protocol.ip.mgcp.message.parms.RequestedAction;
+import jain.protocol.ip.mgcp.message.parms.RequestedEvent;
+import jain.protocol.ip.mgcp.message.parms.ReturnCode;
+import jain.protocol.ip.mgcp.pkg.MgcpEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+
+
+import javax.media.mscontrol.mediagroup.PlayerEvent;
+import org.mobicents.jsr309.mgcp.PackageAU;
+
+/**
+ *
+ * @author kulikov
+ */
+public class PlayAnnouncement implements Action {
+    private MediaGroupImpl executor;
+
+    public PlayAnnouncement(MediaGroupImpl executor) {
+        this.executor = executor;
+    }
+
+    public void execute() {
+        //generate request identifier and transaction ID
+        RequestIdentifier reqID = executor.nextRequestID();
+        int txID = executor.getMediaSession().getDriver().getNextTxID();
+
+        //constructs request
+ NotificationRequest req = new NotificationRequest(this, executor.getEndpoint(), reqID);
+
+ RequestedAction[] actions = new RequestedAction[] { RequestedAction.NotifyImmediately };
+
+        ArrayList<EventName> signalList = new ArrayList();
+        ArrayList<RequestedEvent> eventList = new ArrayList();
+
+ Collection<ConnectionIdentifier> connections = executor.getConnectionIDs();
+        for (ConnectionIdentifier cid : connections) {
+            //player signals
+            signalList.add(new EventName(PackageAU.Name,
+ PackageAU.pa.withParm("an=" + executor.player.uri), cid));
+
+            //player events
+ eventList.add(new RequestedEvent(new EventName(PackageAU.Name, MgcpEvent.oc, cid), actions)); + eventList.add(new RequestedEvent(new EventName(PackageAU.Name, MgcpEvent.of, cid), actions));
+        }
+
+        EventName[] signals = new EventName[signalList.size()];
+       signalList.toArray(signals);
+
+        RequestedEvent[] events = new RequestedEvent[eventList.size()];
+        eventList.toArray(events);
+
+        //new EventName(auPackageName, MgcpEvent.oc, connId)
+        req.setRequestedEvents(events);
+        req.setSignalRequests(signals);
+
+        req.setTransactionHandle(txID);
+ req.setNotifiedEntity(executor.getMediaSession().getDriver().getCallAgent());
+
+        executor.getMediaSession().getDriver().attach(txID, this);
+        executor.getMediaSession().getDriver().attach(reqID, this);
+
+
+        executor.getMediaSession().getDriver().send(req);
+    }
+
+    public void processMgcpCommandEvent(JainMgcpCommandEvent event) {
+        switch (event.getObjectIdentifier()) {
+            case Constants.CMD_NOTIFY :
+                Notify notify = (Notify) event;
+
+                EventName[] events = notify.getObservedEvents();
+                for (EventName evt: events) {
+                    fireEvent(evt);
+                }
+
+                break;
+            default :
+                return;
+        }
+    }
+
+    public void processMgcpResponseEvent(JainMgcpResponseEvent event) {
+        //NotifucationRequest response expected only
+ NotificationRequestResponse evt = (NotificationRequestResponse) event;
+
+        switch (event.getReturnCode().getValue()) {
+            case ReturnCode.TRANSACTION_EXECUTED_NORMALLY :
+                break;
+
+        }
+    }
+
+    private void operationCompleted() {
+ PlayerEventImpl evt = new PlayerEventImpl(executor.player, PlayerEvent.PLAY_COMPLETED, true, PlayerEventImpl.END_OF_PLAY_LIST, null);
+        executor.player.fireEvent(evt);
+    }
+
+    /**
+     * Fires event.
+     *
+     * @param evt the event to be fired
+     */
+    private void fireEvent(EventName evt) {
+        switch (evt.getEventIdentifier().intValue()) {
+            case MgcpEvent.REPORT_ON_COMPLETION :
+                operationCompleted();
+                break;
+            case MgcpEvent.REPORT_FAILURE :
+                //operationFailed();
+                break;
+        }
+
+    }
+
+}
=======================================
--- /dev/null
+++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/jsr309/mgcp/PackageAU.java Sun Dec 26 23:48:09 2010
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.mobicents.jsr309.mgcp;
+
+import jain.protocol.ip.mgcp.pkg.MgcpEvent;
+import jain.protocol.ip.mgcp.pkg.PackageName;
+
+/**
+ * Defines advanced audio package.
+ *
+ * @author kulikov
+ */
+public interface PackageAU {
+    /** package name */
+    public final static PackageName Name = PackageName.factory("AU");
+
+    /** events */
+    public final static MgcpEvent pa = MgcpEvent.factory("pa");
+    public final static MgcpEvent pc = MgcpEvent.factory("pc");
+    public final static MgcpEvent pr = MgcpEvent.factory("pr");
+
+    public final static MgcpEvent oc = MgcpEvent.factory("oc");
+    public final static MgcpEvent of = MgcpEvent.factory("of");
+    public final static MgcpEvent es = MgcpEvent.factory("es");
+
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/Request.java Wed Dec 22 08:05:53 2010
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-package org.mobicents.javax.media.mscontrol.mediagroup;
-
-import jain.protocol.ip.mgcp.message.NotificationRequest;
-import jain.protocol.ip.mgcp.message.parms.EventName;
-import jain.protocol.ip.mgcp.message.parms.RequestIdentifier;
-import jain.protocol.ip.mgcp.message.parms.RequestedAction;
-import jain.protocol.ip.mgcp.message.parms.RequestedEvent;
-
-/**
- *
- * @author kulikov
- */
-public class Request {
-    private MediaGroupImpl parent;
-
-    public Request(MediaGroupImpl parent) {
-        this.parent = parent;
-    }
-
-    public void send() {
-        NotificationRequest req = new NotificationRequest(
-                this, parent.getEndpoint(), new RequestIdentifier("1"));
-
- RequestedAction[] actions = new RequestedAction[] { RequestedAction.NotifyImmediately };
-
-        EventName[] signals = new EventName[0];
-
-        RequestedEvent[] events = new RequestedEvent[0];
-       for (int i = 0; i < events.length; i++) {
-//            events[i] = new RequestedEvent(eveNames.get(i), actions);
-       }
-
-        //new EventName(auPackageName, MgcpEvent.oc, connId)
-        req.setRequestedEvents(events);
-        req.setSignalRequests(signals);
- req.setTransactionHandle(parent.getMediaSession().getDriver().getNextTxID()); - req.setNotifiedEntity(parent.getMediaSession().getDriver().getCallAgent());
-
-        parent.getMediaSession().getDriver().send(req);
-    }
-}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/jsr309/mgcp/MgcpStackFactory.java Thu Feb 18 01:55:41 2010
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.mobicents.jsr309.mgcp;
-
-import jain.protocol.ip.mgcp.CreateProviderException;
-import jain.protocol.ip.mgcp.DeleteProviderException;
-import jain.protocol.ip.mgcp.JainMgcpStack;
-import jain.protocol.ip.mgcp.message.parms.NotifiedEntity;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Properties;
-import java.util.TooManyListenersException;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.log4j.Logger;
-import org.mobicents.protocols.mgcp.stack.JainMgcpStackImpl;
-import org.mobicents.protocols.mgcp.stack.JainMgcpStackProviderImpl;
-
-
-
-/**
- *
- * @author amit bhayani
- *
- */
-public class MgcpStackFactory {
-
- private static final Logger logger = Logger.getLogger(MgcpStackFactory.class);
-       private static MgcpStackFactory mgcpStackFactory;
-
-       /**
-        * Store the MGCP Stack with name provided in HashMap. This gives
-        * flexibility for different applications to instantiate different 
stacks.
-        * Hence in case if one goes down or mis behaves not all applications 
have
-        * to pay penalty
-        */
- private ConcurrentHashMap<String, MgcpWrapper> stringToMgcpWrapper = new ConcurrentHashMap<String, MgcpWrapper>();
-
-       public static final String MGCP_STACK_NAME = "mgcp.stack.name";
-       public static final String MGCP_STACK_IP = "mgcp.stack.ip";
-       public static final String MGCP_STACK_PORT = "mgcp.stack.port";
-       public static final String MGCP_PEER_IP = "mgcp.stack.peer.ip";
-       public static final String MGCP_PEER_PORT = "mgcp.stack.peer.port";
-
-       private MgcpStackFactory() {
-
-       }
-
-       public static MgcpStackFactory getInstance() {
-               if (mgcpStackFactory == null) {
-                       mgcpStackFactory = new MgcpStackFactory();
-               }
-               return mgcpStackFactory;
-       }
-
-       public MgcpWrapper getMgcpStackProvider(Properties properties) {
-               String stackName = "DEFAULT";
-               if (properties != null) {
-                       stackName = properties.getProperty(MGCP_STACK_NAME, 
"DEFAULT");
-               }
-               MgcpWrapper mgcpWrapper = stringToMgcpWrapper.get(stackName);
-
-               if (mgcpWrapper == null) {
-                       String ip = "127.0.0.1";
-                       String portString = "2727";
-                       String mgcpStackPeerIp = "127.0.0.1";
-                       int mgcpStackPeerPort = 2427;
-
-                       if (properties != null) {
-                               ip = properties.getProperty(MGCP_STACK_IP, 
"127.0.0.1");
-                               portString = properties.getProperty(MGCP_STACK_PORT, 
"2727");
-
- mgcpStackPeerIp = properties.getProperty(MgcpStackFactory.MGCP_PEER_IP, "127.0.0.1"); - mgcpStackPeerPort = Integer.parseInt(properties.getProperty(MgcpStackFactory.MGCP_PEER_PORT, "2427"));
-                       }
-
-                       InetAddress inetAddress;
-                       try {
-                               inetAddress = InetAddress.getByName(ip);
-
-                               int port = Integer.parseInt(portString);
-
-                               JainMgcpStackImpl stack = new 
JainMgcpStackImpl(inetAddress, port);
- JainMgcpStackProviderImpl jainMgcpStackProviderImpl = (JainMgcpStackProviderImpl) stack
-                                               .createProvider();
-
-                               if (properties != null) {
-
-                               }
-
- NotifiedEntity notifiedEntity = new NotifiedEntity(inetAddress.getHostName(), inetAddress
-                                               .getHostAddress(), 
stack.getPort());
-
- mgcpWrapper = new MgcpWrapper(jainMgcpStackProviderImpl, notifiedEntity, mgcpStackPeerPort, mgcpStackPeerIp);
-                               
jainMgcpStackProviderImpl.addJainMgcpListener(mgcpWrapper);
-                               stringToMgcpWrapper.put(stackName, mgcpWrapper);
-
-                               if (logger.isDebugEnabled()) {
- logger.debug("Created new MgcpWrapper for MGCP_STACK_NAME = " + stackName);
-                               }
-
-                               return mgcpWrapper;
-                       } catch (UnknownHostException e) {
-                               logger.error(e);
-                       } catch (CreateProviderException e) {
-                               logger.error(e);
-                       } catch (TooManyListenersException e) {
-                               logger.error(e);
-                       }
-               } else {
-                       if (logger.isDebugEnabled()) {
- logger.debug("Found JainMgcpStackProvider for MGCP_STACK_NAME = " + stackName);
-                       }
-                       return mgcpWrapper;
-               }
-
-               return null;
-       }
-
-       public void clearMgcpStackProvider(Properties properties) {
-               String stackName = "DEFAULT";
-               if (properties != null) {
-                       stackName = properties.getProperty(MGCP_STACK_NAME, 
"DEFAULT");
-               }
-               MgcpWrapper mgcpWrapper = 
this.stringToMgcpWrapper.get(stackName);
-
-               if (mgcpWrapper == null) {
- logger.warn("No JainMgcpStackProvider found for MGCP_STACK_NAME = " + stackName);
-               } else {
- JainMgcpStackProviderImpl stackProvider = mgcpWrapper.getJainMgcpStackProvider();
-                       stackProvider.removeJainMgcpListener(mgcpWrapper);
-                       JainMgcpStack mgcpStack = 
stackProvider.getJainMgcpStack();
-                       try {
-                               
mgcpStack.deleteProvider(mgcpWrapper.getJainMgcpStackProvider());
-                               this.stringToMgcpWrapper.remove(stackName);
-                               if (logger.isDebugEnabled()) {
- logger.debug("Successfully deleted JainMgcpStackProvider for MGCP_STACK_NAME = " + stackName);
-                               }
-                       } catch (DeleteProviderException e) {
-                               logger.error(e);
-                       }
-               }
-
-       }
-}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/jsr309/mgcp/MgcpWrapper.java Mon Apr 26 03:48:08 2010
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.mobicents.jsr309.mgcp;
-
-import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
-import jain.protocol.ip.mgcp.JainMgcpEvent;
-import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
-import jain.protocol.ip.mgcp.message.Constants;
-import jain.protocol.ip.mgcp.message.Notify;
-import jain.protocol.ip.mgcp.message.parms.CallIdentifier;
-import jain.protocol.ip.mgcp.message.parms.NotifiedEntity;
-import jain.protocol.ip.mgcp.message.parms.RequestIdentifier;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.mobicents.protocols.mgcp.stack.JainMgcpExtendedListener;
-import org.mobicents.protocols.mgcp.stack.JainMgcpStackProviderImpl;
-
-/**
- *
- * @author amit bhayani
- *
- */
-public class MgcpWrapper implements JainMgcpExtendedListener {
-
-       private String peerIp = "127.0.0.1";
-       private int peerPort = 2427;
-
-       private JainMgcpStackProviderImpl jainMgcpStackProviderImpl;
-       private static Logger logger = Logger.getLogger(MgcpWrapper.class);
- private Map<Integer, JainMgcpExtendedListener> mgcpListeners = new HashMap<Integer, JainMgcpExtendedListener>();
-
-       // This is mapping of RequestIdentifier and Listener
- private Map<String, JainMgcpExtendedListener> mgcpListenersForNotify = new HashMap<String, JainMgcpExtendedListener>();
-
-       private NotifiedEntity defaultNotfEntity = null;
-
- public MgcpWrapper(JainMgcpStackProviderImpl jainMgcpStackProviderImpl, NotifiedEntity defaultNotfEntity,
-                       int peerPort, String peerIp) {
-               this.jainMgcpStackProviderImpl = jainMgcpStackProviderImpl;
-               this.peerPort = peerPort;
-               this.peerIp = peerIp;
-
-               this.defaultNotfEntity = defaultNotfEntity;
-
-       }
-
-       public void addListener(int tx, JainMgcpExtendedListener listener) {
-               this.mgcpListeners.put(tx, listener);
-       }
-
- public void addListener(RequestIdentifier requestId, JainMgcpExtendedListener listener) {
-               this.mgcpListenersForNotify.put(requestId.toString(), listener);
-       }
-
-       public void removeListener(int tx) {
-               this.mgcpListeners.remove(tx);
-       }
-
-       public void removeListener(RequestIdentifier requestId) {
-               this.mgcpListenersForNotify.remove(requestId.toString());
-       }
-
-       public JainMgcpStackProviderImpl getJainMgcpStackProvider() {
-               return this.jainMgcpStackProviderImpl;
-       }
-
-       public void transactionEnded(int tx) {
-               JainMgcpExtendedListener listener = mgcpListeners.get(tx);
-               if (listener != null) {
-                       listener.transactionEnded(tx);
-               }
-       }
-
-       public void transactionRxTimedOut(JainMgcpCommandEvent command) {
-               int tx = command.getTransactionHandle();
-               JainMgcpExtendedListener listener = mgcpListeners.get(tx);
-               if (listener != null) {
-                       listener.transactionRxTimedOut(command);
-               }
-       }
-
-       public void transactionTxTimedOut(JainMgcpCommandEvent command) {
-               int tx = command.getTransactionHandle();
-               JainMgcpExtendedListener listener = mgcpListeners.get(tx);
-               if (listener != null) {
-                       listener.transactionTxTimedOut(command);
-               }
-       }
-
-       public void processMgcpCommandEvent(JainMgcpCommandEvent command) {
-               switch (command.getObjectIdentifier()) {
-               case Constants.CMD_NOTIFY:
-                       Notify ntfy = (Notify) command;
-                       RequestIdentifier requestId = 
ntfy.getRequestIdentifier();
- JainMgcpExtendedListener listener = mgcpListenersForNotify.get(requestId.toString());
-                       if (listener != null) {
-                               listener.processMgcpCommandEvent(command);
-                       } else {
- logger.warn("Received NTFY command " + command.toString() + " but no handler for this");
-                       }
-                       break;
-               default:
-                       logger.error("This command in un-expected" + 
command.toString());
-                       break;
-               }
-       }
-
-       public void processMgcpResponseEvent(JainMgcpResponseEvent response) {
-               int tx = response.getTransactionHandle();
-               JainMgcpExtendedListener listener = mgcpListeners.get(tx);
-               if (listener != null) {
-                       listener.processMgcpResponseEvent(response);
-               } else {
- logger.warn("Received Response " + response.toString() + " but no handler for this");
-               }
-       }
-
- public void sendMgcpEvents(JainMgcpEvent[] events) throws IllegalArgumentException {
-               this.jainMgcpStackProviderImpl.sendMgcpEvents(events);
-       }
-
-       public String getPeerIp() {
-               return peerIp;
-       }
-
-       public int getPeerPort() {
-               return peerPort;
-       }
-
-       public CallIdentifier getUniqueCallIdentifier() {
-               return this.jainMgcpStackProviderImpl.getUniqueCallIdentifier();
-       }
-
-       public RequestIdentifier getUniqueRequestIdentifier() {
-               return 
this.jainMgcpStackProviderImpl.getUniqueRequestIdentifier();
-       }
-
-       public int getUniqueTransactionHandler() {
-               return 
this.jainMgcpStackProviderImpl.getUniqueTransactionHandler();
-
-       }
-
-       public NotifiedEntity getDefaultNotifiedEntity() {
-               return this.defaultNotfEntity;
-       }
-
-}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/jsr309/mgcp/Provider.java Sun Mar 29 20:51:30 2009
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.mobicents.jsr309.mgcp;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- *
- * @author amit bhayani
- *
- */
-public class Provider {
-
- private static transient ExecutorService pool = Executors.newFixedThreadPool(10, new ThreadFactoryImpl());
-
-       public Provider() {
-
-       }
-
-       public static void submit(Runnable task) {
-               pool.submit(task);
-       }
-
-       static class ThreadFactoryImpl implements ThreadFactory {
-
-               final ThreadGroup group;
-               static final AtomicInteger msProviderPoolNumber = new 
AtomicInteger(1);
-               final AtomicInteger threadNumber = new AtomicInteger(1);
-               final String namePrefix;
-
-               ThreadFactoryImpl() {
-                       SecurityManager s = System.getSecurityManager();
- group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); - namePrefix = "MsProviderImpl-FixedThreadPool-" + msProviderPoolNumber.getAndIncrement() + "-thread-";
-               }
-
-               public Thread newThread(Runnable r) {
- Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
-                       if (t.isDaemon()) {
-                               t.setDaemon(false);
-                       }
-                       if (t.getPriority() != Thread.NORM_PRIORITY) {
-                               t.setPriority(Thread.NORM_PRIORITY);
-                       }
-                       return t;
-               }
-       }
-}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/XMLParser.java Wed Dec 22 08:05:53 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/XMLParser.java Sun Dec 26 23:48:09 2010
@@ -16,7 +16,6 @@

import org.mobicents.javax.media.mscontrol.mediagroup.signals.SignalDetectorEventDetectorFactory;
 import org.mobicents.javax.media.mscontrol.resource.ExtendedParameter;
-import org.mobicents.jsr309.mgcp.MgcpWrapper;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/MediaGroupImpl.java Sun Dec 26 05:47:07 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/MediaGroupImpl.java Sun Dec 26 23:48:09 2010
@@ -1,22 +1,9 @@
 package org.mobicents.javax.media.mscontrol.mediagroup;

-import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
-import jain.protocol.ip.mgcp.JainMgcpListener;
-import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
-import jain.protocol.ip.mgcp.message.Constants;
-import jain.protocol.ip.mgcp.message.DeleteConnectionResponse;
-import jain.protocol.ip.mgcp.message.NotificationRequest;
-import jain.protocol.ip.mgcp.message.Notify;
-import jain.protocol.ip.mgcp.message.NotifyResponse;
+import jain.protocol.ip.mgcp.message.parms.ConnectionIdentifier;
 import jain.protocol.ip.mgcp.message.parms.EndpointIdentifier;
-import jain.protocol.ip.mgcp.message.parms.EventName;
 import jain.protocol.ip.mgcp.message.parms.RequestIdentifier;

-import jain.protocol.ip.mgcp.message.parms.RequestedAction;
-import jain.protocol.ip.mgcp.message.parms.RequestedEvent;
-import jain.protocol.ip.mgcp.message.parms.ReturnCode;
-import jain.protocol.ip.mgcp.pkg.MgcpEvent;
-import jain.protocol.ip.mgcp.pkg.PackageName;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,7 +14,6 @@
 import javax.media.mscontrol.MsControlException;
 import javax.media.mscontrol.mediagroup.MediaGroup;
 import javax.media.mscontrol.mediagroup.Player;
-import javax.media.mscontrol.mediagroup.PlayerEvent;
 import javax.media.mscontrol.mediagroup.Recorder;
 import javax.media.mscontrol.mediagroup.signals.SignalDetector;
 import javax.media.mscontrol.mediagroup.signals.SignalGenerator;
@@ -45,7 +31,7 @@
  * @author amit bhayani
  *
  */
-public class MediaGroupImpl extends ContainerImpl implements MediaGroup, JainMgcpListener {
+public class MediaGroupImpl extends ContainerImpl implements MediaGroup {

public final static MediaConfig PLAYER_CONFIG = new PlayerConfigImpl().getConfig(); public final static MediaConfig SIGNAL_DETECTOR_CONFIG = new SignalDetectorConfig().getConfig();
@@ -177,119 +163,22 @@
         // TODO : Handle RTC
         }

-    }
-
-    protected void sendRequest() {
-        //generate request identifier
- reqID = new RequestIdentifier(Integer.toString(session.getUniqueReqID())); - NotificationRequest req = new NotificationRequest(this, getEndpoint(), reqID); - RequestedAction[] actions = new RequestedAction[] { RequestedAction.NotifyImmediately };
-
-        ArrayList<EventName> signalList = new ArrayList();
-        ArrayList<RequestedEvent> eventList = new ArrayList();
-
-        Collection<LocalConnection> connections = this.getConnections();
-        for (LocalConnection c : connections) {
-            //player signals
- signalList.add(new EventName(PackageName.factory("AU"), MgcpEvent.ann.withParm(player.uri), c.getID()));
-
-            //player events
- eventList.add(new RequestedEvent(new EventName(PackageName.factory("AU"), MgcpEvent.oc, c.getID()), actions)); - eventList.add(new RequestedEvent(new EventName(PackageName.factory("AU"), MgcpEvent.of, c.getID()), actions));
-        }
-
-        EventName[] signals = new EventName[signalList.size()];
-       signalList.toArray(signals);
-
-        RequestedEvent[] events = new RequestedEvent[eventList.size()];
-        eventList.toArray(events);
-
-        //new EventName(auPackageName, MgcpEvent.oc, connId)
-        req.setRequestedEvents(events);
-        req.setSignalRequests(signals);
-
- req.setTransactionHandle(getMediaSession().getDriver().getNextTxID()); - req.setNotifiedEntity(getMediaSession().getDriver().getCallAgent());
-
-        getMediaSession().getDriver().attach(reqID, this);
-        getMediaSession().getDriver().send(req);
-    }
-
-    private void operationCompleted() {
- PlayerEventImpl evt = new PlayerEventImpl(player, PlayerEvent.PLAY_COMPLETED, true, PlayerEventImpl.END_OF_PLAY_LIST, null);
-        player.fireEvent(evt);
     }

     /**
-     * Fires event.
+     * Generates unique request identifier.
      *
-     * @param evt the event to be fired
+     * @return request identifier object.
      */
-    private void fireEvent(EventName evt) {
-        switch (evt.getEventIdentifier().intValue()) {
-            case MgcpEvent.REPORT_ON_COMPLETION :
-                operationCompleted();
-                break;
-            case MgcpEvent.REPORT_FAILURE :
-                //operationFailed();
-                break;
-        }
-
+    protected RequestIdentifier nextRequestID() {
+ return new RequestIdentifier(Integer.toString(session.getUniqueReqID()));
     }

-    /**
- * Check if specified endpoint matches to endpoint related to this media group.
-     *
-     * @param enp the endpoint identifier to check.
- * @return true if specified endpoint identifier matches to endpoint of this group.
-     */
-    private boolean isSameEndpoint(EndpointIdentifier enp) {
- return enp.getLocalEndpointName().equals(this.endpointName.getLocalEndpointName());
-    }
-
-    /**
-     * Request identifier comparator
-     * @param requestID the request identifier to compare.
- * @return true if specified request identifier is same as last for last sent request.
-     */
-    private boolean isSameRequest(RequestIdentifier requestID) {
-        return requestID.toString().equals(this.reqID.toString());
-    }
-
-    public void processMgcpCommandEvent(JainMgcpCommandEvent event) {
-        //process commands related to this endpoint only
-//        if (!isSameEndpoint(event.getEndpointIdentifier())) {
-//            return;
-//        }
-
-        JainMgcpResponseEvent response = null;
-
-        switch (event.getObjectIdentifier()) {
-            case Constants.CMD_DELETE_CONNECTION :
- response = new DeleteConnectionResponse(this, ReturnCode.Transaction_Executed_Normally);
-                break;
-            case Constants.CMD_NOTIFY :
-                Notify notify = (Notify) event;
- response = new NotifyResponse(this, ReturnCode.Transaction_Executed_Normally);
-
-                if (!this.isSameRequest(notify.getRequestIdentifier())) {
-                    break;
-                }
-
-                EventName[] events = notify.getObservedEvents();
-                for (EventName evt: events) {
-                    fireEvent(evt);
-                }
-                break;
-            default :
-                return;
-        }
-
-        response.setTransactionHandle(event.getTransactionHandle());
-        session.getDriver().send(response);
-    }
-
-    public void processMgcpResponseEvent(JainMgcpResponseEvent event) {
-        System.out.println("Receive response: " + event);
+    protected Collection<ConnectionIdentifier> getConnectionIDs() {
+        ArrayList<ConnectionIdentifier> list = new ArrayList();
+        for (LocalConnection c : getConnections()) {
+            list.add(c.getID());
+        }
+        return list;
     }
 }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java Sat Dec 25 06:54:07 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java Sun Dec 26 23:48:09 2010
@@ -55,11 +55,14 @@

     protected String uri;

+    private PlayAnnouncement action;
+
//-------------------------------------------------------------------------------------------/

     protected PlayerImpl(MediaGroupImpl parent) throws MsControlException {
         this.parent = parent;
         this.initFSM();
+        action = new PlayAnnouncement(parent);
     }

     private void initFSM() {
@@ -89,7 +92,7 @@


     // Player methods
- public void play(URI[] uris, RTC[] arg1, Parameters params) throws MsControlException { + public void play(URI[] uris, RTC[] rtc, Parameters params) throws MsControlException {
         this.checkURI(uris);
         try {
             fsm.signal(SIGNAL_PLAY);
@@ -166,7 +169,7 @@

         public void process(State state) {
             System.out.println("Sending Request-------------->");
-            parent.sendRequest();
+            action.execute();
         }

     }
@@ -189,7 +192,6 @@
     private class StopRequest implements TransitionHandler {

         public void process(State state) {
-            parent.sendRequest();
         }

     }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mixer/MediaMixerImpl.java Sun Dec 26 05:47:07 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mixer/MediaMixerImpl.java Sun Dec 26 23:48:09 2010
@@ -1,5 +1,6 @@
 package org.mobicents.javax.media.mscontrol.mixer;

+import jain.protocol.ip.mgcp.message.parms.EndpointIdentifier;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -34,9 +35,18 @@
     protected List<MixerAdapter> adaptors = new ArrayList<MixerAdapter>();
protected CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>> listeners = new CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>>();

+
public MediaMixerImpl(MediaSessionImpl mediaSession, MediaConfigImpl config) throws MsControlException {
         super(mediaSession, config.getParameters());
         this.config = config;
+
+        //determine endpoint local name
+        String localName = (String)config.getValue(ENDPOINT_NAME);
+ //domain name of the server is constructed using proprties from config
+        String domainName = session.getDriver().getRemoteDomainName();
+
+        //finally, the endpoint identifier is constructed
+        endpointName = new EndpointIdentifier(localName, domainName);
     }

public MixerAdapter createMixerAdapter(Configuration<MixerAdapter> config) throws MsControlException {
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/vxml/VxmlDialogImpl.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/vxml/VxmlDialogImpl.java Sun Dec 26 23:48:09 2010
@@ -17,7 +17,6 @@
 import org.apache.log4j.Logger;
 import org.mobicents.javax.media.mscontrol.container.ContainerImpl;
 import org.mobicents.javax.media.mscontrol.MediaSessionImpl;
-import org.mobicents.jsr309.mgcp.MgcpWrapper;

 /**
  *
@@ -30,7 +29,7 @@
        private URI uri = null;
        private Parameters parameters = null;

- public VxmlDialogImpl(MediaSessionImpl mediaSession, MgcpWrapper mgcpWrapper, Parameters params)
+       public VxmlDialogImpl(MediaSessionImpl mediaSession, Parameters params)
                        throws MsControlException {
                super(mediaSession, null);
                this.session = mediaSession;

Reply via email to