[Red5commits] [600] lhubbard

[luke@codegent.com]

Some more changes to shared objects.


Timestamp: 03/27/06 18:59:26 (less than one hour ago) 
Change: 600 
Author: lhubbard

Files (see diff or trac for details): 
java/server/branches/red5_refactor/src/org/red5/server/adapter/AbstractScopeAdapter.java
java/server/branches/red5_refactor/src/org/red5/server/adapter/StatefulScopeWrappingAdapter.java
java/server/branches/red5_refactor/src/org/red5/server/api/IScopeHandler.java
java/server/branches/red5_refactor/src/org/red5/server/so/ISharedObjectMessage.java
java/server/branches/red5_refactor/src/org/red5/server/so/SharedObjectEvent.java
java/server/branches/red5_refactor/src/org/red5/server/so/SharedObjectMessage.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/600

Index: /java/server/branches/red5_refactor/src/org/red5/server/adapter/StatefulScopeWrappingAdapter.java
===================================================================
--- /java/server/branches/red5_refactor/src/org/red5/server/adapter/StatefulScopeWrappingAdapter.java (revision 596)
+++ /java/server/branches/red5_refactor/src/org/red5/server/adapter/StatefulScopeWrappingAdapter.java (revision 600)
@@ -18,5 +18,5 @@
 	implements IScopeAware {
 	
-	protected IScope scope;
+	protected IScope scope; 
 	
 	public void setScope(IScope scope) {
Index: /java/server/branches/red5_refactor/src/org/red5/server/adapter/AbstractScopeAdapter.java
===================================================================
--- /java/server/branches/red5_refactor/src/org/red5/server/adapter/AbstractScopeAdapter.java (revision 597)
+++ /java/server/branches/red5_refactor/src/org/red5/server/adapter/AbstractScopeAdapter.java (revision 600)
@@ -62,12 +62,4 @@
 	}
 
-	public IServiceCall postProcessServiceCall(IConnection conn, IServiceCall call) {
-		return call;
-	}
-
-	public IServiceCall preProcessServiceCall(IConnection conn, IServiceCall call) {
-		return call;
-	}
-
 	public boolean addChildScope(IBasicScope scope) {
 		return canAddChildScope;
@@ -81,15 +73,4 @@
 		return canHandleEvent;
 	}
-	
-	/*
-	private boolean canConnectSharedObject = true;
-	private boolean canDeleteSharedObject = true;
-	private boolean canUpdateSharedObject = true;
-	private boolean canSendSharedObject = true;
-	private boolean canPublishStream = true;
-	private boolean canRecordStream = true;
-	private boolean canBroadcastStream = true;
-	private boolean canSubscribeToBroadcastStream = true;
-	private boolean canConnectToOnDemandStream = true;
-	*/
+
 }
Index: /java/server/branches/red5_refactor/src/org/red5/server/so/SharedObjectEvent.java
===================================================================
--- /java/server/branches/red5_refactor/src/org/red5/server/so/SharedObjectEvent.java (revision 600)
+++ /java/server/branches/red5_refactor/src/org/red5/server/so/SharedObjectEvent.java (revision 600)
@@ -0,0 +1,34 @@
+package org.red5.server.so;
+
+
+public class SharedObjectEvent 
+	implements ISharedObjectEvent {
+
+	private Type type;
+	private String key;
+	private Object value;
+	
+	public SharedObjectEvent(Type type, String key, Object value){
+		this.type = type;
+		this.key = key;
+		this.value = value;
+	}
+	
+	public String getKey() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Type getType() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Object getValue() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	
+	
+}
Index: /java/server/branches/red5_refactor/src/org/red5/server/so/SharedObjectMessage.java
===================================================================
--- /java/server/branches/red5_refactor/src/org/red5/server/so/SharedObjectMessage.java (revision 600)
+++ /java/server/branches/red5_refactor/src/org/red5/server/so/SharedObjectMessage.java (revision 600)
@@ -0,0 +1,83 @@
+package org.red5.server.so;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import org.red5.server.api.event.IEventListener;
+
+public class SharedObjectMessage implements ISharedObjectMessage {
+
+	private IEventListener source;
+	private String name;
+	private LinkedList<ISharedObjectEvent> events = new LinkedList<ISharedObjectEvent>();
+	private int version = 0;
+	private boolean persistent = false;
+	
+	public SharedObjectMessage(IEventListener source, String name, int version, boolean persistent){
+		this.source = source;
+		this.name = name;
+		this.version = version;
+		this.persistent = persistent;
+	}
+	
+	public int getVersion() {
+		return version;
+	}
+
+	public String getName() {
+		return name;
+	}
+	
+	public boolean isPersistent() {
+		return persistent;
+	}
+	
+	public void addEvent(ISharedObjectEvent event){
+		events.add(event);
+	}
+	
+	public LinkedList<ISharedObjectEvent> getEvents(){
+		return events;
+	}
+
+	public void addEvent(ISharedObjectEvent.Type type, String key, Object value) {
+		events.add(new SharedObjectEvent(type, key, value));
+	}
+
+	public void clear() {
+		events.clear();
+	}
+
+	public boolean isEmpty() {
+		return events.isEmpty();
+	}
+
+	public Type getType() {
+		return Type.SHARED_OBJECT;
+	}
+
+	public Object getObject() {
+		return getEvents();
+	}
+
+	public boolean hasSource() {
+		return source != null;
+	}
+
+	public IEventListener getSource() {
+		return source;
+	}
+
+	public String toString(){
+		final StringBuffer sb = new StringBuffer();
+		sb.append("SharedObjectMessage: ").append(name).append(" { ");
+		final Iterator it = events.iterator();
+		while(it.hasNext()){
+			sb.append(it.next());
+			if(it.hasNext()) sb.append(" , ");
+		}
+		sb.append(" } ");
+		return sb.toString();
+	}
+	
+}
Index: /java/server/branches/red5_refactor/src/org/red5/server/so/ISharedObjectMessage.java
===================================================================
--- /java/server/branches/red5_refactor/src/org/red5/server/so/ISharedObjectMessage.java (revision 596)
+++ /java/server/branches/red5_refactor/src/org/red5/server/so/ISharedObjectMessage.java (revision 600)
@@ -3,5 +3,7 @@
 import java.util.List;
 
-public interface ISharedObjectMessage extends org.red5.server.api.event.IEvent {
+import org.red5.server.api.event.IEvent;
+
+public interface ISharedObjectMessage extends IEvent {
 
 	/**
@@ -39,5 +41,5 @@
 	public void clear();
 	
-	public boolean isEmpty();
+	public boolean isEmpty(); 
 	
 }
Index: /java/server/branches/red5_refactor/src/org/red5/server/api/IScopeHandler.java
===================================================================
--- /java/server/branches/red5_refactor/src/org/red5/server/api/IScopeHandler.java (revision 597)
+++ /java/server/branches/red5_refactor/src/org/red5/server/api/IScopeHandler.java (revision 600)
@@ -46,5 +46,5 @@
 	 *            the new scope object
 	 */
-	boolean start(IScope scope);
+	boolean start(IScope scope); 
 
 	/**
@@ -91,14 +91,4 @@
 
 	/**
-	 * Called just before a service call This is a chance to modify the call
-	 * object
-	 * 
-	 * @param call
-	 *            the call object
-	 * @return same or modified call object
-	 */
-	IServiceCall preProcessServiceCall(IConnection conn, IServiceCall call);
-
-	/**
 	 * Called when a service is called
 	 * 
@@ -108,13 +98,4 @@
 	boolean serviceCall(IConnection conn, IServiceCall call);
 
-	/**
-	 * Called just after a service call This is a chance to modify the result
-	 * object
-	 * 
-	 * @param call
-	 * @return same or modified call object
-	 */
-	IServiceCall postProcessServiceCall(IConnection conn, IServiceCall call);
-