Author: jmarino
Date: Fri Apr 14 23:35:58 2006
New Revision: 394266
URL: http://svn.apache.org/viewcvs?rev=394266&view=rev
Log:
removal of dead code
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/AddressingConstants.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/AddressingFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/AddressingFactoryImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java?rev=394266&r1=394265&r2=394266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
Fri Apr 14 23:35:58 2006
@@ -16,26 +16,19 @@
*/
package org.apache.tuscany.core.message;
-import org.apache.tuscany.core.addressing.EndpointReference;
import org.apache.tuscany.core.invocation.MessageChannel;
import org.apache.tuscany.core.invocation.TargetInvoker;
-import java.util.Map;
-
/**
* Represents a request, response, or exception for an invocation
+ *
+ * @version $Rev $Date
*/
public interface Message {
/**
- * Return any message headers associated with the invocation.
- */
- Map<String, Object> getHeaders();
-
- /**
* Returns the body of the message, which will be the payload or parameters
* associated with the invocation
- * FIXME what is different w/ getPayload()?
*/
Object getBody();
@@ -45,138 +38,19 @@
void setBody(Object body);
/**
- * Returns true if the message is a request message
- * FIXME is this still used?
- */
- boolean isRequest();
-
- /**
- * Returns true if the message is an inbound message
- * FIXME is this still used?
- */
- boolean isResponse();
-
- /**
- * Sets the To header
- * FIXME Javadoc
- */
- void setTo(EndpointReference to);
-
- /**
- * Returns the To header
- * FIXME Javadoc
- */
- EndpointReference getTo();
-
- /**
- * Sets the From header
- * FIXME Javadoc
- */
- void setFrom(EndpointReference from);
-
- /**
- * Returns the From header
- * FIXME Javadoc
- */
- EndpointReference getFrom();
-
- /**
- * Sets the message ID
- */
- void setMessageID(String messageID);
-
- /**
- * Returns the message ID
- */
- String getMessageID();
-
- /**
- * Sets the Action header
- * FIXME Javadoc
- */
- void setAction(String action);
-
- /**
- * Returns the Action header
- * FIXME Javadoc
- */
- String getAction();
-
- /**
- * Sets the ReplyTo header
- * FIXME Javadoc
- */
- void setReplyTo(EndpointReference replyTo);
-
- /**
- * Returns the ReplyTo header
- * FIXME Javadoc
- */
- EndpointReference getReplyTo();
-
- /**
- * Sets the RelatesTo header
- * FIXME Javadoc
- */
- void setRelatesTo(String relatesTo);
-
- /**
- * Returns the RelatesTo header
- * FIXME Javadoc
- */
- String getRelatesTo();
-
- /**
- * Sets the FaultTo header
- * FIXME Javadoc
- */
- void setFaultTo(EndpointReference faultTo);
-
- /**
- * Returns the FaultTo header
- * FIXME Javadoc
- */
- EndpointReference getFaultTo();
-
- /**
- * Sets the EndpointReference header
- * FIXME Javadoc
- */
- void setEndpointReference(EndpointReference endpointReference);
-
- /**
- * Returns the EndpointReference header
- * FIXME Javadoc
- */
- EndpointReference getEndpointReference();
-
- /**
- * Sets the operation name
- * FIXME Javadoc
- */
- void setOperationName(String operationName);
-
- /**
- * Returns the operation name
- * FIXME Javadoc
- */
- String getOperationName();
-
- /**
* Returns the callback channel
- * FIXME Javadoc
*/
MessageChannel getCallbackChannel();
/**
- * Returns the related callback message
- * FIXME Javadoc
+ * Sets the target invoker to dispatch to for the current invocation the
message is flowing through
*/
- Message getRelatedCallbackMessage();
-
- //ADDED
public void setTargetInvoker(TargetInvoker invoker);
- public TargetInvoker getTargetInvoker();
-
-} // Message
+ /**
+ * Returns the target invoker to dispatch to for the current invocation
the message is flowing through
+ */
+ public TargetInvoker getTargetInvoker();
+
+ public Message getRelatedCallbackMessage();
+}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java?rev=394266&r1=394265&r2=394266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
Fri Apr 14 23:35:58 2006
@@ -16,45 +16,25 @@
*/
package org.apache.tuscany.core.message.impl;
-import org.apache.tuscany.core.addressing.EndpointReference;
import org.apache.tuscany.core.invocation.MessageChannel;
import org.apache.tuscany.core.invocation.TargetInvoker;
import org.apache.tuscany.core.message.Message;
-import java.util.HashMap;
-import java.util.Map;
-
/**
+ * The default implementation of an invocation message
+ *
+ * @version $Rev $Date
*/
public class MessageImpl implements Message, MessageChannel {
- private String action;
private Object body;
- private EndpointReference endpointReference;
- private EndpointReference faultTo;
- private EndpointReference from;
- private Map<String, Object> headers;
- private String messageID;
- private String operationName;
private Message relatedCallbackMessage;
- private String relatesTo;
- private EndpointReference replyTo;
private TargetInvoker invoker;
- private EndpointReference to;
- /**
- * Constructor
- */
protected MessageImpl() {
super();
}
- /**
- * @see org.apache.tuscany.core.message.Message#getAction()
- */
- public String getAction() {
- return action;
- }
/**
* @see org.apache.tuscany.core.message.Message#getBody()
@@ -64,92 +44,6 @@
}
/**
- * @see org.apache.tuscany.core.message.Message#getEndpointReference()
- */
- public EndpointReference getEndpointReference() {
- return endpointReference;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#getFaultTo()
- */
- public EndpointReference getFaultTo() {
- return faultTo;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#getFrom()
- */
- public EndpointReference getFrom() {
- return from;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#getHeaders()
- */
- public Map<String, Object> getHeaders() {
- if (headers==null)
- headers=new HashMap<String, Object>();
- return headers;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#getMessageID()
- */
- public String getMessageID() {
- return messageID;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#getOperationName()
- */
- public String getOperationName() {
- return operationName;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#getRelatesTo()
- */
- public String getRelatesTo() {
- return relatesTo;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#getReplyTo()
- */
- public EndpointReference getReplyTo() {
- return replyTo;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#getTo()
- */
- public EndpointReference getTo() {
- return to;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#isRequest()
- */
- public boolean isRequest() {
- return relatesTo==null;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#isResponse()
- */
- public boolean isResponse() {
- return relatesTo!=null;
- }
-
- /**
- * @see org.apache.tuscany.core.message.Message#setAction(java.lang.String)
- */
- public void setAction(String action) {
- this.action=action;
- }
-
- /**
* @see org.apache.tuscany.core.message.Message#setBody(java.lang.Object)
*/
public void setBody(Object body) {
@@ -157,62 +51,6 @@
}
/**
- * @see
org.apache.tuscany.core.message.Message#setEndpointReference(org.apache.tuscany.core.client.runtime.addressing.sdo.EndpointReference)
- */
- public void setEndpointReference(EndpointReference endpointReference) {
- this.endpointReference=endpointReference;
- }
-
- /**
- * @see
org.apache.tuscany.core.message.Message#setFaultTo(org.apache.tuscany.core.client.runtime.addressing.sdo.EndpointReference)
- */
- public void setFaultTo(EndpointReference faultTo) {
- this.faultTo=faultTo;
- }
-
- /**
- * @see
org.apache.tuscany.core.message.Message#setFrom(org.apache.tuscany.core.client.runtime.addressing.sdo.EndpointReference)
- */
- public void setFrom(EndpointReference from) {
- this.from=from;
- }
-
- /**
- * @see
org.apache.tuscany.core.message.Message#setMessageID(java.lang.String)
- */
- public void setMessageID(String messageID) {
- this.messageID=messageID;
- }
-
- /**
- * @see
org.apache.tuscany.core.message.Message#setOperationName(java.lang.String)
- */
- public void setOperationName(String operationName) {
- this.operationName=operationName;
- }
-
- /**
- * @see
org.apache.tuscany.core.message.Message#setRelatesTo(java.lang.String)
- */
- public void setRelatesTo(String relatesTo) {
- this.relatesTo=relatesTo;
- }
-
- /**
- * @see
org.apache.tuscany.core.message.Message#setReplyTo(org.apache.tuscany.core.client.runtime.addressing.sdo.EndpointReference)
- */
- public void setReplyTo(EndpointReference replyTo) {
- this.replyTo=replyTo;
- }
-
- /**
- * @see
org.apache.tuscany.core.message.Message#setTo(org.apache.tuscany.core.client.runtime.addressing.sdo.EndpointReference)
- */
- public void setTo(EndpointReference to) {
- this.to=to;
- }
-
- /**
* @see org.apache.tuscany.core.message.Message#getCallbackChannel()
*/
public MessageChannel getCallbackChannel() {
@@ -232,7 +70,7 @@
public Message getRelatedCallbackMessage() {
return relatedCallbackMessage;
}
-
+
/**
* @see
org.apache.tuscany.core.message.Message#setTargetInvoker(org.apache.tuscany.core.invocation.TargetInvoker)
*/
