You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2005/03/13 22:58:40 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/ws/rm SequenceOffer.java CreateSequence.java
chamikara 2005/03/13 13:58:40
Modified: sandesha/src/org/apache/sandesha/server RMInvoker.java
sandesha/src/org/apache/sandesha/ws/rm CreateSequence.java
Added: sandesha/src/org/apache/sandesha/ws/rm SequenceOffer.java
Log:
When there was no offer the create seq. message was still having a offer part. This bug was fixed.
Revision Changes Path
1.19 +1 -0 ws-fx/sandesha/src/org/apache/sandesha/server/RMInvoker.java
Index: RMInvoker.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/RMInvoker.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- RMInvoker.java 12 Mar 2005 19:14:57 -0000 1.18
+++ RMInvoker.java 13 Mar 2005 21:58:39 -0000 1.19
@@ -108,6 +108,7 @@
SOAPEnvelope createSequenceEnvelope = EnvelopeCreator.createCreateSequenceEnvelope(id,
rmMsgContext, Constants.SERVER);
+
rmMsgContext.getMsgContext().setRequestMessage(new Message(createSequenceEnvelope));
//TODO Check : Are We are sending only to the ReplyTo?
1.16 +6 -2 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/CreateSequence.java
Index: CreateSequence.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/CreateSequence.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CreateSequence.java 12 Mar 2005 19:14:57 -0000 1.15
+++ CreateSequence.java 13 Mar 2005 21:58:39 -0000 1.16
@@ -51,7 +51,7 @@
createSequence.setName(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.CREATE_SEQUENCE);
//TEST - added for offer
- offer = new SequenceOffer ();
+ //offer = new SequenceOffer ();
//END TEST
}
@@ -94,7 +94,9 @@
bodyElement.setName(Constants.WSRM.CREATE_SEQUENCE);
- offer.toSOAPEnvelope(bodyElement);
+ if(offer!=null)
+ offer.toSOAPEnvelope(bodyElement);
+
return env;
}
@@ -114,8 +116,10 @@
//TEST OFFER
childElement = (MessageElement) iterator.next();
if (childElement.getName().equals(Constants.WSU.WSU_PREFIX + Constants.COLON + Constants.WSRM.SEQUENCE_OFFER)) {
+ offer = new SequenceOffer ();
offer.fromSOAPEnvelope(childElement);
}else if (childElement.getName().equals(Constants.WSRM.SEQUENCE_OFFER)) {
+ offer = new SequenceOffer ();
offer.fromSOAPEnvelope(childElement);
}
1.1 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/SequenceOffer.java
Index: SequenceOffer.java
===================================================================
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.sandesha.ws.rm;
import java.util.Iterator;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPException;
import org.apache.axis.message.MessageElement;
import org.apache.axis.message.SOAPBodyElement;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.sandesha.Constants;
import org.apache.sandesha.ws.utility.Identifier;
/**
* class SequenceOffer
* @author Jaliya Ekanayaka
* @author Chamikara Jayalath
*/
public class SequenceOffer extends MessageElement implements IRmElement {
private MessageElement offerElement;
private Identifier identifier;
public SequenceOffer (){
offerElement = new MessageElement();
offerElement.setName(Constants.WSRM.NS_PREFIX_RM+Constants.COLON+Constants.WSRM.SEQUENCE_OFFER);
}
public void addChildElement(MessageElement element) throws SOAPException {
offerElement.addChildElement(element);
}
public MessageElement getSoapElement() throws SOAPException {
offerElement.addChildElement(identifier.getSoapElement());
return offerElement;
}
public SequenceOffer fromSOAPEnvelope(MessageElement element) {
Iterator iterator = element.getChildElements();
MessageElement childElement;
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
if (childElement.getName().equals(Constants.WSU.WSU_PREFIX+Constants.COLON+Constants.WSU.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
if (childElement.getName().equals(Constants.WSU.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
}
return this;
}
public MessageElement toSOAPEnvelope(MessageElement element)
throws SOAPException {
if(identifier!=null)
identifier.toSOAPEnvelope(offerElement);
element.addChildElement(offerElement);
return element;
}
public Identifier getIdentifier() {
return identifier;
}
public void setIdentifier(Identifier identifier) {
this.identifier = identifier;
}
}