From b4ccf4593343639b322b1b986af6489b8a0a24e9 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 22 Jul 2009 20:19:26 +0000
Subject: Remove conversation ID from reference parameters. Not required for
 OASIS

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@796867 13f79535-47bb-0310-9956-ffa450edef68
---
 .../assembly/impl/ReferenceParameterProcessor.java   |  5 +----
 .../core/assembly/impl/ReferenceParametersImpl.java  | 20 +-------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

(limited to 'java/sca/modules/core')

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
index 2c833a885e..5daffab507 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
@@ -62,7 +62,6 @@ public class ReferenceParameterProcessor implements StAXArtifactProcessor<Refere
      */
     public ReferenceParameters read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
         ReferenceParameters parameters = new ReferenceParametersImpl();
-        parameters.setConversationID(reader.getAttributeValue(null, "conversationID"));
         parameters.setCallbackID(reader.getAttributeValue(null, "callbackID"));
         return parameters;
     }
@@ -76,9 +75,7 @@ public class ReferenceParameterProcessor implements StAXArtifactProcessor<Refere
                                  REFERENCE_PARAMETERS.getLocalPart(),
                                  REFERENCE_PARAMETERS.getNamespaceURI());
         writer.writeNamespace(REFERENCE_PARAMETERS.getPrefix(), REFERENCE_PARAMETERS.getNamespaceURI());
-        if (model.getConversationID() != null) {
-            writer.writeAttribute("conversationID", model.getConversationID().toString());
-        }
+
         if (model.getCallbackID() != null) {
             writer.writeAttribute("callbackID", model.getCallbackID().toString());
         }
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
index b2b8c86919..7bd56271a5 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
@@ -27,7 +27,6 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters;
  */
 public class ReferenceParametersImpl implements ReferenceParameters {
     private Object callbackID;
-    private Object conversationID;
     private EndpointReference callbackReference;
     private Object callbackObjectID;
     
@@ -43,18 +42,6 @@ public class ReferenceParametersImpl implements ReferenceParameters {
     public void setCallbackID(Object callbackID) {
         this.callbackID = callbackID;
     }
-    /**
-     * @return the conversationID
-     */
-    public Object getConversationID() {
-        return conversationID;
-    }
-    /**
-     * @param conversationID the conversationID to set
-     */
-    public void setConversationID(Object conversationID) {
-        this.conversationID = conversationID;
-    }
 
     /**
      * @see org.apache.tuscany.sca.runtime.ReferenceParameters#getCallbackReference()
@@ -99,7 +86,6 @@ public class ReferenceParametersImpl implements ReferenceParameters {
         result = prime * result + ((callbackID == null) ? 0 : callbackID.hashCode());
         result = prime * result + ((callbackObjectID == null) ? 0 : callbackObjectID.hashCode());
         result = prime * result + ((callbackReference == null) ? 0 : callbackReference.hashCode());
-        result = prime * result + ((conversationID == null) ? 0 : conversationID.hashCode());
         return result;
     }
     /**
@@ -129,11 +115,7 @@ public class ReferenceParametersImpl implements ReferenceParameters {
                 return false;
         } else if (!callbackReference.equals(other.callbackReference))
             return false;
-        if (conversationID == null) {
-            if (other.conversationID != null)
-                return false;
-        } else if (!conversationID.equals(other.conversationID))
-            return false;
+
         return true;
     }
 }
-- 
cgit v1.2.3