[ebxmlms-commits] ebxmlms/src/hk/hku/cecid/phoenix/message/packaging Acknowledgment.java,1.8,1.9 EbxmlMessage.java,1.36,1.37 HeaderElement.java,1.7,1.8

[<bob...@us...>]

Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/packaging
In directory sc8-pr-cvs1:/tmp/cvs-serv23918/src/hk/hku/cecid/phoenix/message/packaging

Modified Files:
	Acknowledgment.java EbxmlMessage.java HeaderElement.java 
Log Message:
Make the actor of acknowledgment object changable.
Set the acknowledgment actor to the value on AckRequested,
or use default.

Fix a Http.java bug which wrongly set the value of first MIME Header of
Sync Reply to be the header field.

Index: Acknowledgment.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/packaging/Acknowledgment.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Acknowledgment.java	15 Apr 2003 02:05:39 -0000	1.8
--- Acknowledgment.java	17 Nov 2003 02:09:33 -0000	1.9
***************
*** 124,128 ****
          this.timestamp = timestamp;
          this.refToMessageId = refToMessage.getMessageId();
! 
          addChildElement(MessageHeader.ELEMENT_TIMESTAMP, timestamp);
          addChildElement(MessageHeader.ELEMENT_REF_TO_MESSAGE_ID,
--- 124,128 ----
          this.timestamp = timestamp;
          this.refToMessageId = refToMessage.getMessageId();
!         setActor(ACTOR_TO_PARTY_MSH_URN);
          addChildElement(MessageHeader.ELEMENT_TIMESTAMP, timestamp);
          addChildElement(MessageHeader.ELEMENT_REF_TO_MESSAGE_ID,

Index: EbxmlMessage.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/packaging/EbxmlMessage.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** EbxmlMessage.java	20 Aug 2003 08:02:09 -0000	1.36
--- EbxmlMessage.java	17 Nov 2003 02:09:33 -0000	1.37
***************
*** 656,659 ****
--- 656,663 ----
              new Acknowledgment(soapEnvelope, timestamp, refToMessage,
                                 fromPartyId, fromPartyIdType);
+         String actor = refToMessage.getAckRequested().getActor();
+         if (actor != null) {
+             acknowledgment.setActor(actor);
+         }
          headerContainer.addExtensionElement(acknowledgment);
          saveChanges();

Index: HeaderElement.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/packaging/HeaderElement.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HeaderElement.java	16 Jul 2003 08:54:10 -0000	1.7
--- HeaderElement.java	17 Nov 2003 02:09:33 -0000	1.8
***************
*** 129,131 ****
--- 129,135 ----
          }
      }
+     
+     public String getActor() {
+         return actor;
+     }
  }