Revision: 16040
Author: oleg.kulikoff
Date: Fri Dec 24 03:07:40 2010
Log: Issue #899: Player's events added
http://code.google.com/p/mobicents/source/detail?r=16040
Modified:
/trunk/servers/jain-slee/resources/mscontrol/du
/trunk/servers/jain-slee/resources/mscontrol/events
/trunk/servers/jain-slee/resources/mscontrol/events/src/main/resources/META-INF/event-jar.xml
/trunk/servers/jain-slee/resources/mscontrol/library
/trunk/servers/jain-slee/resources/mscontrol/ra
/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/NetworkConnectionActivityHandle.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/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/SessionLocal.java
/trunk/servers/jain-slee/resources/mscontrol/ratype
/trunk/servers/jain-slee/resources/mscontrol/ratype/src/main/java/org/mobicents/slee/resource/mediacontrol/MscActivityContextInterfaceFactory.java
/trunk/servers/jain-slee/resources/mscontrol/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
=======================================
---
/trunk/servers/jain-slee/resources/mscontrol/events/src/main/resources/META-INF/event-jar.xml
Wed Nov 17 02:00:38 2010
+++
/trunk/servers/jain-slee/resources/mscontrol/events/src/main/resources/META-INF/event-jar.xml
Fri Dec 24 03:07:40 2010
@@ -7,7 +7,8 @@
<library-vendor>org.mobicents.resources</library-vendor>
<library-version>${pom.version}</library-version>
</library-ref>
- <!-- jcc connection events -->
+
+ <!-- Network connection events -->
<event-definition>
<event-type-name>javax.media.mscontrol.networkconnection.SdpPortManagerEvent.ANSWER_GENERATED</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
@@ -35,4 +36,53 @@
<event-type-version>1.0</event-type-version>
<event-class-name>javax.media.mscontrol.networkconnection.SdpPortManagerEvent</event-class-name>
</event-definition>
+
+ <!-- Join/Unjoin Events -->
+ <event-definition>
+
<event-type-name>javax.media.mscontrol.join.JoinEvent.JOINED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+
<event-class-name>javax.media.mscontrol.join.JoinEvent</event-class-name>
+ </event-definition>
+
+ <event-definition>
+
<event-type-name>javax.media.mscontrol.join.JoinEvent.UNJOINED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+
<event-class-name>javax.media.mscontrol.join.JoinEvent</event-class-name>
+ </event-definition>
+
+
+ <!-- Media Player Events -->
+ <event-definition>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.PLAY_COMPLETED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+
<event-class-name>javax.media.mscontrol.mediagroup.PlayerEvent</event-class-name>
+ </event-definition>
+ <event-definition>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.PAUSED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+
<event-class-name>javax.media.mscontrol.mediagroup.PlayerEvent</event-class-name>
+ </event-definition>
+ <event-definition>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.RESUMED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+
<event-class-name>javax.media.mscontrol.mediagroup.PlayerEvent</event-class-name>
+ </event-definition>
+ <event-definition>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.SPEED_CHANGED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+
<event-class-name>javax.media.mscontrol.mediagroup.PlayerEvent</event-class-name>
+ </event-definition>
+ <event-definition>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.VOLUME_CHANGED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+
<event-class-name>javax.media.mscontrol.mediagroup.PlayerEvent</event-class-name>
+ </event-definition>
+
</event-jar>
=======================================
---
/trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/McResourceAdaptor.java
Wed Nov 17 02:00:38 2010
+++
/trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/McResourceAdaptor.java
Fri Dec 24 03:07:40 2010
@@ -183,7 +183,15 @@
e.printStackTrace();
}
}
-
+
+ public void terminateActivity(ActivityHandle handle) {
+ MsActivity activity = (MsActivity) activities.remove(handle);
+ if (activity != null) {
+ handlers.remove(activity.getID());
+ }
+ sleeEndpoint.endActivity(handle);
+ }
+
public Object getActivity(ActivityHandle handle) {
System.out.println("==== GET ACTIVITY ");
return activities.get(handle);
@@ -215,6 +223,7 @@
}
protected void fireEvent(String eventName, ActivityHandle
activityHandle, MediaEvent event) {
+ tracer.info("Fire event: " + event);
FireableEventType eventID = null;
try {
EventTypeID eventTypeId = new
EventTypeID(eventName, "org.mobicents", "1.0");
@@ -232,7 +241,7 @@
ue.printStackTrace();
throw new RuntimeException("JccResourceAdaptor.firEvent():
UnrecognizedEventException caught.", ue);
}
-
+System.out.println("EventID=" + eventID);
if (eventID == null) {
if (tracer.isWarningEnabled()) {
tracer.warning("Unknown event type: " + eventName);
=======================================
---
/trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/NetworkConnectionActivityHandle.java
Wed Nov 17 02:00:38 2010
+++
/trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/NetworkConnectionActivityHandle.java
Fri Dec 24 03:07:40 2010
@@ -20,6 +20,9 @@
import javax.media.mscontrol.MediaEvent;
import javax.media.mscontrol.MediaEventListener;
+import javax.media.mscontrol.MsControlException;
+import javax.media.mscontrol.join.JoinEvent;
+import javax.media.mscontrol.join.JoinEventListener;
import javax.media.mscontrol.networkconnection.SdpPortManagerEvent;
import javax.slee.resource.ActivityHandle;
import
org.mobicents.slee.resource.mediacontrol.local.NetworkConnectionLocal;
@@ -28,20 +31,31 @@
*
* @author kulikov
*/
-public class NetworkConnectionActivityHandle implements ActivityHandle,
MediaEventListener {
+public class NetworkConnectionActivityHandle implements ActivityHandle,
MediaEventListener, JoinEventListener {
private NetworkConnectionLocal connection;
private McResourceAdaptor ra;
- public NetworkConnectionActivityHandle(McResourceAdaptor ra,
NetworkConnectionLocal connection) {
+ public NetworkConnectionActivityHandle(McResourceAdaptor ra,
NetworkConnectionLocal connection) throws MsControlException {
this.ra = ra;
this.connection = connection;
+ connection.getSdpPortManager().addListener(this);
+ connection.addActivityHandle(this);
}
@Override
public boolean equals(Object other) {
- if (!(other instanceof NetworkConnectionLocal)) {
+ if (this == other) {
+ return true;
+ }
+
+ if (other == null) {
return false;
- }
+ }
+
+ if (this.getClass() != other.getClass()) {
+ return false;
+ }
+
return
((NetworkConnectionActivityHandle)other).connection.equals(this.connection);
}
@@ -62,6 +76,16 @@
ra.fireEvent("javax.media.mscontrol.networkconnection.SdpPortManagerEvent.ANSWER_PROCESSED",
this, event);
} else if
(event.getEventType().equals(SdpPortManagerEvent.NETWORK_STREAM_FAILURE)) {
ra.fireEvent("javax.media.mscontrol.networkconnection.SdpPortManagerEvent.NETWORK_STREAM_FAILURE",
this, event);
+ ra.terminateActivity(this);
}
}
-}
+
+ public void onEvent(JoinEvent event) {
+ if (event.getEventType().equals(JoinEvent.JOINED)) {
+ //TODO: wrap event to with local objects
+ ra.fireEvent("javax.media.mscontrol.join.JoinEvent.JOINED",
this, event);
+ } else if (event.getEventType().equals(JoinEvent.UNJOINED)) {
+ ra.fireEvent("javax.media.mscontrol.join.JoinEvent.UNJOINED",
this, event);
+ }
+ }
+}
=======================================
---
/trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/NetworkConnectionLocal.java
Wed Nov 17 02:00:38 2010
+++
/trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/NetworkConnectionLocal.java
Fri Dec 24 03:07:40 2010
@@ -22,7 +22,6 @@
import java.net.URI;
import java.util.Iterator;
import javax.media.mscontrol.MediaConfig;
-import javax.media.mscontrol.MediaEventListener;
import javax.media.mscontrol.MediaObject;
import javax.media.mscontrol.MediaSession;
import javax.media.mscontrol.MsControlException;
@@ -44,7 +43,7 @@
*
* @author kulikov
*/
-public class NetworkConnectionLocal extends MsActivity implements
NetworkConnection {
+public class NetworkConnectionLocal extends MsActivity implements
NetworkConnection, LocalJoinable {
private String ID = Long.toHexString(System.currentTimeMillis());
private NetworkConnection connection;
@@ -53,11 +52,6 @@
protected NetworkConnectionLocal(NetworkConnection connection,
McResourceAdaptor ra) {
this.connection = connection;
this.ra = ra;
- this.connection.addListener(ra);
- try {
- this.connection.getSdpPortManager().addListener(ra);
- } catch (Exception e) {
- }
}
@Override
@@ -93,22 +87,30 @@
connection.unjoin(other);
}
- public void joinInitiate(Direction arg0, Joinable arg1, Serializable
arg2) throws MsControlException {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void joinInitiate(Direction direction, Joinable otherParty,
Serializable context) throws MsControlException {
+ this.connection.joinInitiate(direction,
((LocalJoinable)otherParty).getOrigin(), context);
}
- public void unjoinInitiate(Joinable arg0, Serializable arg1) throws
MsControlException {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void unjoinInitiate(Joinable otherParty, Serializable context)
throws MsControlException {
+ this.connection.unjoinInitiate(otherParty, context);
}
public void addListener(JoinEventListener listener) {
throw new SecurityException("SBB can not assign listener");
}
-
+
public void removeListener(JoinEventListener arg0) {
throw new SecurityException("SBB can not assign listener");
}
+ public void addActivityHandle(NetworkConnectionActivityHandle h) {
+ connection.addListener(h);
+ }
+
+ public void removeActivityHandle(NetworkConnectionActivityHandle h) {
+ connection.removeListener(h);
+ }
+
public MediaSession getMediaSession() {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -161,6 +163,7 @@
throw new SecurityException("SBB can not assign listener");
}
+
public void removeListener(AllocationEventListener arg0) {
throw new SecurityException("SBB can not assign listener");
}
@@ -168,7 +171,18 @@
@Override
public boolean equals(Object other) {
- return other instanceof NetworkConnectionLocal &&
((NetworkConnectionLocal) other).ID.equals(this.ID);
+ if (this == other) {
+ return true;
+ }
+
+ if (other == null) {
+ return false;
+ }
+
+ if (other.getClass() != this.getClass()) {
+ return false;
+ }
+ return ((NetworkConnectionLocal) other).ID.equals(this.ID);
}
@Override
@@ -177,4 +191,8 @@
hash = 59 * hash + (this.ID != null ? this.ID.hashCode() : 0);
return hash;
}
-}
+
+ public Joinable getOrigin() {
+ return this.connection;
+ }
+}
=======================================
---
/trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/SessionLocal.java
Wed Nov 17 02:00:38 2010
+++
/trunk/servers/jain-slee/resources/mscontrol/ra/src/main/java/org/mobicents/slee/resource/mediacontrol/local/SessionLocal.java
Fri Dec 24 03:07:40 2010
@@ -33,6 +33,7 @@
import javax.media.mscontrol.networkconnection.NetworkConnection;
import javax.media.mscontrol.vxml.VxmlDialog;
import org.mobicents.slee.resource.mediacontrol.McResourceAdaptor;
+import org.mobicents.slee.resource.mediacontrol.MediaGroupActivityHandle;
import
org.mobicents.slee.resource.mediacontrol.NetworkConnectionActivityHandle;
/**
@@ -56,16 +57,25 @@
return local;
}
- public NetworkConnection
createNetworkConnection(Configuration<NetworkConnection> arg0, Parameters
arg1) throws MsControlException {
- throw new UnsupportedOperationException("Not supported yet.");
+ public NetworkConnection
createNetworkConnection(Configuration<NetworkConnection> config, Parameters
params) throws MsControlException {
+ NetworkConnectionLocal local = new
NetworkConnectionLocal(session.createNetworkConnection(config, params), ra);
+ NetworkConnectionActivityHandle h = new
NetworkConnectionActivityHandle(ra, local);
+ ra.createActivity(h, local);
+ return local;
}
- public NetworkConnection createNetworkConnection(MediaConfig arg0,
Parameters arg1) throws MsControlException {
- throw new UnsupportedOperationException("Not supported yet.");
+ public NetworkConnection createNetworkConnection(MediaConfig cfg,
Parameters params) throws MsControlException {
+ NetworkConnectionLocal local = new
NetworkConnectionLocal(session.createNetworkConnection(cfg, params), ra);
+ NetworkConnectionActivityHandle h = new
NetworkConnectionActivityHandle(ra, local);
+ ra.createActivity(h, local);
+ return local;
}
- public MediaGroup createMediaGroup(Configuration<MediaGroup> arg0)
throws MsControlException {
- throw new UnsupportedOperationException("Not supported yet.");
+ public MediaGroup createMediaGroup(Configuration<MediaGroup> config)
throws MsControlException {
+ MediaGroupLocal local = new MediaGroupLocal(this,
session.createMediaGroup(config));
+ MediaGroupActivityHandle h = new MediaGroupActivityHandle(ra,
local);
+ ra.createActivity(h, local);
+ return local;
}
public MediaGroup createMediaGroup(Configuration<MediaGroup> arg0,
Parameters arg1) throws MsControlException {
=======================================
---
/trunk/servers/jain-slee/resources/mscontrol/ratype/src/main/java/org/mobicents/slee/resource/mediacontrol/MscActivityContextInterfaceFactory.java
Wed Nov 17 02:00:38 2010
+++
/trunk/servers/jain-slee/resources/mscontrol/ratype/src/main/java/org/mobicents/slee/resource/mediacontrol/MscActivityContextInterfaceFactory.java
Fri Dec 24 03:07:40 2010
@@ -4,6 +4,7 @@
*/
package org.mobicents.slee.resource.mediacontrol;
+import javax.media.mscontrol.mediagroup.MediaGroup;
import javax.media.mscontrol.networkconnection.NetworkConnection;
import javax.slee.ActivityContextInterface;
import javax.slee.FactoryException;
@@ -17,4 +18,6 @@
public ActivityContextInterface
getActivityContextInterface(NetworkConnection connection)
throws NullPointerException, UnrecognizedActivityException,
FactoryException;
-}
+ public ActivityContextInterface getActivityContextInterface(MediaGroup
group)
+ throws NullPointerException, UnrecognizedActivityException,
FactoryException;
+}
=======================================
---
/trunk/servers/jain-slee/resources/mscontrol/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Wed Nov 17 02:00:38 2010
+++
/trunk/servers/jain-slee/resources/mscontrol/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Fri Dec 24 03:07:40 2010
@@ -50,6 +50,47 @@
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
+
+ <!-- JOIN EVENTS -->
+ <event-type-ref>
+
<event-type-name>javax.media.mscontrol.join.JoinEvent.JOINED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+
+ <event-type-ref>
+
<event-type-name>javax.media.mscontrol.join.JoinEvent.UNJOINED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+
+ <!-- Media Player Events -->
+ <event-type-ref>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.PLAY_COMPLETED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+ <event-type-ref>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.PAUSED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+ <event-type-ref>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.RESUMED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+ <event-type-ref>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.SPEED_CHANGED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+ <event-type-ref>
+
<event-type-name>javax.media.mscontrol.mediagroup.PlayerEvent.VOLUME_CHANGED</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+
</resource-adaptor-type>
</resource-adaptor-type-jar>