Cleaned up Ameche dependencies.

rayo-core/src/main/java/com/rayo/core/OfferEvent.java

@@ -11,7 +11,6 @@ public class OfferEvent extends AbstractCallEvent {
 
     private URI to;
     private URI from;
-    private CallDirection direction; 
     private Map<String, String> headers;
 
     public OfferEvent(String callId) {
@@ -34,14 +33,6 @@ public void setFrom(URI from) {
         this.from = from;
     }
 
-    public CallDirection getDirection() {
-        return direction;
-    }
-
-    public void setDirection(CallDirection direction) {
-        this.direction = direction;
-    }
-
     public Map<String, String> getHeaders() {
         return headers;
     }
@@ -56,7 +47,6 @@ public String toString() {
     	return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)    		
     		.append("from",from)
     		.append("to",to)
-            .append("direction",direction)
     		.append("headers",headers)
     		.toString();
     }

rayo-core/src/main/java/com/rayo/core/xml/providers/RayoProvider.java

@@ -1,7 +1,5 @@
 package com.rayo.core.xml.providers;
 
-import static com.voxeo.utils.Strings.isEmpty;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -18,7 +16,6 @@
 import com.rayo.core.AcceptCommand;
 import com.rayo.core.AnswerCommand;
 import com.rayo.core.AnsweredEvent;
-import com.rayo.core.CallDirection;
 import com.rayo.core.CallRef;
 import com.rayo.core.CallRejectReason;
 import com.rayo.core.ConnectCommand;
@@ -217,9 +214,6 @@ private Object buildOfferEvent(Element element) throws URISyntaxException {
         offer.setFrom(toURI(element.attributeValue("from")));
         offer.setTo(toURI(element.attributeValue("to")));
         String dir = element.attributeValue("direction");
-        if (!isEmpty(dir)) {
-            offer.setDirection(toEnum(CallDirection.class, "direction", element));
-        }
         offer.setHeaders(grabHeaders(element));
 
         return offer;
@@ -727,11 +721,6 @@ private Document createOfferEvent(Object object, Document document) {
         root.addAttribute("to", offer.getTo().toString());
         root.addAttribute("from", offer.getFrom().toString());
 
-        CallDirection direction = offer.getDirection();
-        if(direction != null) {
-            root.addAttribute("direction", direction.toString().toLowerCase());
-        }
-
         addHeaders(offer.getHeaders(), root);
 
         return document;

rayo-server/pom.xml

@@ -18,17 +18,6 @@
 			<artifactId>rayo-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.ameche</groupId>
-			<artifactId>ameche-model</artifactId>
-			<version>${ameche.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>com.voxeo</groupId>
 			<artifactId>vlib-core</artifactId>

rayo-server/src/main/java/com/rayo/server/CallActor.java

@@ -38,7 +38,6 @@
 import com.rayo.core.verb.UnmuteCommand;
 import com.rayo.server.exception.RayoProtocolException;
 import com.rayo.server.exception.RayoProtocolException.Condition;
-import com.rayo.server.ims.CallDirectionResolver;
 import com.voxeo.exceptions.NotFoundException;
 import com.voxeo.logging.Loggerf;
 import com.voxeo.moho.Call;
@@ -70,8 +69,6 @@ public class CallActor <T extends Call> extends AbstractActor<T> {
     private CallRegistry callRegistry;
     private MixerManager mixerManager;
     private CallManager callManager;
-    private DialingCoordinator dialingCoordinator;
-    private CallDirectionResolver callDirectionResolver;
 
     // This is used to synchronize Answered event with media join as Moho may send you 
     // an answered event before the media is joined
@@ -656,22 +653,6 @@ public void setCallManager(CallManager callManager) {
         this.callManager = callManager;
     }
 
-	public DialingCoordinator getDialingCoordinator() {
-		return dialingCoordinator;
-	}
-
-	public void setDialingCoordinator(DialingCoordinator dialingCoordinator) {
-		this.dialingCoordinator = dialingCoordinator;
-	}
-
-	public void setCallDirectionResolver(CallDirectionResolver callDirectionResolver) {
-		this.callDirectionResolver = callDirectionResolver;
-	}
-
-	public CallDirectionResolver getCallDirectionResolver() {
-		return callDirectionResolver;
-	}
-
 	public CallActor<?> getCallActor(String id) {
 
 		return callRegistry.get(id);

rayo-server/src/main/java/com/rayo/server/DefaultCallActorFactory.java

@@ -2,7 +2,6 @@
 
 import org.jetlang.fibers.PoolFiberFactory;
 
-import com.rayo.server.ims.CallDirectionResolver;
 import com.rayo.server.verb.VerbManager;
 import com.voxeo.logging.Loggerf;
 import com.voxeo.moho.Call;
@@ -19,8 +18,6 @@ public class DefaultCallActorFactory implements CallActorFactory {
     private CallRegistry callRegistry;
     private MixerManager mixerManager;
     private CallManager callManager;
-    private DialingCoordinator dialingCoordinator;
-    private CallDirectionResolver callDirectionResolver;
 
     @Override
     public CallActor<?> create(Call call) {
@@ -43,8 +40,6 @@ public CallActor<?> create(Call call) {
         actor.setCallRegistry(callRegistry);
         actor.setMixerManager(mixerManager);
         actor.setCallManager(callManager);
-        actor.setDialingCoordinator(dialingCoordinator);
-        actor.setCallDirectionResolver(callDirectionResolver);
         return actor;
     }
 
@@ -91,17 +86,4 @@ public CallManager getCallManager() {
     public void setCallManager(CallManager callManager) {
         this.callManager = callManager;
     }
-
-	public DialingCoordinator getDialingCoordinator() {
-		return dialingCoordinator;
-	}
-
-	public void setDialingCoordinator(DialingCoordinator dialingCoordinator) {
-		this.dialingCoordinator = dialingCoordinator;
-	}
-
-	public void setCallDirectionResolver(CallDirectionResolver callDirectionResolver) {
-
-		this.callDirectionResolver = callDirectionResolver;
-	}
 }