You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2006/07/11 14:42:27 UTC

svn commit: r420822 [1/4] - in /webservices/sandesha/trunk/c: include/ include/sandesha2/ src/client/ src/msgprocessors/ src/storage/beans/ src/storage/inmemory/ src/transport/ src/util/ src/workers/ src/wsrm/

Author: damitha
Date: Tue Jul 11 05:42:25 2006
New Revision: 420822

URL: http://svn.apache.org/viewvc?rev=420822&view=rev
Log:
More file name changes

Added:
    webservices/sandesha/trunk/c/include/sandesha2_create_seq_bean.h
      - copied unchanged from r420800, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_create_seq_bean.h
    webservices/sandesha/trunk/c/include/sandesha2_invoker_bean.h
      - copied unchanged from r420800, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_invoker_bean.h
    webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h
      - copied, changed from r420800, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_next_msg_bean.h
    webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h
      - copied, changed from r420800, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sender_bean.h
    webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h
      - copied, changed from r420800, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_seq_property_bean.h
    webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
    webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c
      - copied unchanged from r420809, webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_create_seq_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c
      - copied unchanged from r420809, webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_invoker_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c
      - copied, changed from r420809, webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c
      - copied unchanged from r420809, webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_sender_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c
      - copied, changed from r420809, webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_seq_property_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/storage_manager.c
      - copied unchanged from r420809, webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_storage_manager.c
    webservices/sandesha/trunk/c/src/storage/inmemory/transaction.c
      - copied unchanged from r420809, webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_transaction.c
Removed:
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_create_seq_bean.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_invoker_bean.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_next_msg_bean.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sender_bean.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_seq_property_bean.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_seq_property_bean_manager.h
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_create_seq_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_invoker_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_sender_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_seq_property_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_storage_manager.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_transaction.c
Modified:
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_error.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_property_bean.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sequence.h
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h
    webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_sequence_report.h
    webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_transaction.h
    webservices/sandesha/trunk/c/src/client/sandesha2_client_constatns.h
    webservices/sandesha/trunk/c/src/client/sandesha_client.c
    webservices/sandesha/trunk/c/src/client/sequence_report.c
    webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
    webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c
    webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c
    webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c
    webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c
    webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am
    webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
    webservices/sandesha/trunk/c/src/util/utils.c
    webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
    webservices/sandesha/trunk/c/src/wsrm/close_seq.c
    webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c
    webservices/sandesha/trunk/c/src/wsrm/create_seq.c
    webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
    webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
    webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
    webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
    webservices/sandesha/trunk/c/src/wsrm/sequence.c
    webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c
    webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c

Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h Tue Jul 11 05:42:25 2006
@@ -38,21 +38,21 @@
 	 */
 	#define SANDESHA2_SPEC_2005_02_NS_URI "http://schemas.xmlsoap.org/ws/2005/02/rm"
 		
-	#define SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQUENCE "http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence"
+	#define SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ "http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence"
 
-	#define SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQUENCE_RESPONSE  "http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse"
+	#define SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ_RESPONSE  "http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse"
 
-	#define SANDESHA2_SPEC_2005_02_ACTION_SEQUENCE_ACKNOWLEDGEMENT  "http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement"
+	#define SANDESHA2_SPEC_2005_02_ACTION_SEQ_ACKNOWLEDGEMENT  "http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement"
 
-	#define SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQUENCE  "http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence"
+	#define SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ  "http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence"
 
-	#define SANDESHA2_SPEC_2005_02_SOAP_ACTION_CREATE_SEQUENCE  "http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence"
+	#define SANDESHA2_SPEC_2005_02_SOAP_ACTION_CREATE_SEQ  "http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence"
 
-	#define SANDESHA2_SPEC_2005_02_SOAP_ACTION_CREATE_SEQUENCE_RESPONSE  "http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse"
+	#define SANDESHA2_SPEC_2005_02_SOAP_ACTION_CREATE_SEQ_RESPONSE  "http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse"
 
-	#define SANDESHA2_SPEC_2005_02_SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT  "http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement"
+	#define SANDESHA2_SPEC_2005_02_SOAP_ACTION_SEQ_ACKNOWLEDGEMENT  "http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement"
 
-	#define SANDESHA2_SPEC_2005_02_SOAP_ACTION_TERMINATE_SEQUENCE  "http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence"
+	#define SANDESHA2_SPEC_2005_02_SOAP_ACTION_TERMINATE_SEQ  "http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence"
 	
 	/**
 	 * Spec 2005-10
@@ -60,35 +60,35 @@
 			
 	#define SANDESHA2_SPEC_2005_10_NS_URI  "http://docs.oasis-open.org/ws-rx/wsrm/200602"
 		
-	#define SANDESHA2_SPEC_2005_10_ACTION_CREATE_SEQUENCE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequence"
+	#define SANDESHA2_SPEC_2005_10_ACTION_CREATE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequence"
 
-	#define SANDESHA2_SPEC_2005_10_ACTION_CREATE_SEQUENCE_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequenceResponse"
+	#define SANDESHA2_SPEC_2005_10_ACTION_CREATE_SEQ_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequenceResponse"
 
-	#define SANDESHA2_SPEC_2005_10_ACTION_SEQUENCE_ACKNOWLEDGEMENT  "http://docs.oasis-open.org/ws-rx/wsrm/200602/SequenceAcknowledgement"
+	#define SANDESHA2_SPEC_2005_10_ACTION_SEQ_ACKNOWLEDGEMENT  "http://docs.oasis-open.org/ws-rx/wsrm/200602/SequenceAcknowledgement"
 
-	#define SANDESHA2_SPEC_2005_10_ACTION_TERMINATE_SEQUENCE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequence"
+	#define SANDESHA2_SPEC_2005_10_ACTION_TERMINATE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequence"
 			
-	#define SANDESHA2_SPEC_2005_10_ACTION_TERMINATE_SEQUENCE_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequenceResponse"
+	#define SANDESHA2_SPEC_2005_10_ACTION_TERMINATE_SEQ_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequenceResponse"
 			
 	#define SANDESHA2_SPEC_2005_10_ACTION_ACK_REQUEST  "http://docs.oasis-open.org/ws-rx/wsrm/200602/AckRequested"
 			
-	#define SANDESHA2_SPEC_2005_10_ACTION_CLOSE_SEQUENCE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequence"
+	#define SANDESHA2_SPEC_2005_10_ACTION_CLOSE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequence"
 			
-	#define SANDESHA2_SPEC_2005_10_ACTION_CLOSE_SEQUENCE_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequenceResponse"
+	#define SANDESHA2_SPEC_2005_10_ACTION_CLOSE_SEQ_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequenceResponse"
 			
-	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_CREATE_SEQUENCE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequence"
+	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_CREATE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequence"
 
-	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_CREATE_SEQUENCE_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequenceResponse"
+	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_CREATE_SEQ_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequenceResponse"
 
-	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT  "http://docs.oasis-open.org/ws-rx/wsrm/200602/SequenceAcknowledgement"
+	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_SEQ_ACKNOWLEDGEMENT  "http://docs.oasis-open.org/ws-rx/wsrm/200602/SequenceAcknowledgement"
 
-	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_TERMINATE_SEQUENCE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequence"
+	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_TERMINATE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequence"
 			
-	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_TERMINATE_SEQUENCE_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequenceResponse"
+	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_TERMINATE_SEQ_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequenceResponse"
 			
 	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_ACK_REQUEST  "http://docs.oasis-open.org/ws-rx/wsrm/200602/AckRequested"
 			
-	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_CLOSE_SEQUENCE  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequence"
+	#define SANDESHA2_SPEC_2005_10_SOAP_ACTION_CLOSE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequence"
 
 	/**
 	 * WSRM Common constants
@@ -100,29 +100,29 @@
 
 	#define SANDESHA2_WSRM_COMMON_LAST_MSG  "LastMessage"
 
-	#define SANDESHA2_WSRM_COMMON_SEQUENCE  "Sequence"
+	#define SANDESHA2_WSRM_COMMON_SEQ  "Sequence"
 
-	#define SANDESHA2_WSRM_COMMON_SEQUENCE_OFFER  "Offer"
+	#define SANDESHA2_WSRM_COMMON_SEQ_OFFER  "Offer"
 
-	#define SANDESHA2_WSRM_COMMON_TERMINATE_SEQUENCE  "TerminateSequence"
+	#define SANDESHA2_WSRM_COMMON_TERMINATE_SEQ  "TerminateSequence"
 
-	#define SANDESHA2_WSRM_COMMON_CLOSE_SEQUENCE  "CloseSequence"
+	#define SANDESHA2_WSRM_COMMON_CLOSE_SEQ  "CloseSequence"
 		
-	#define SANDESHA2_WSRM_COMMON_CLOSE_SEQUENCE_RESPONSE  "CloseSequenceResponse"
+	#define SANDESHA2_WSRM_COMMON_CLOSE_SEQ_RESPONSE  "CloseSequenceResponse"
 		
-	#define SANDESHA2_WSRM_COMMON_TERMINATE_SEQUENCE_RESPONSE  "TerminateSequenceResponse"
+	#define SANDESHA2_WSRM_COMMON_TERMINATE_SEQ_RESPONSE  "TerminateSequenceResponse"
 		
 	#define SANDESHA2_WSRM_COMMON_FAULT_CODE  "FaultCode"
 
-	#define SANDESHA2_WSRM_COMMON_SEQUENCE_FAULT  "SequenceFault"
+	#define SANDESHA2_WSRM_COMMON_SEQ_FAULT  "SequenceFault"
 
 	#define SANDESHA2_WSRM_COMMON_ACKS_TO  "AcksTo"
 
 	#define SANDESHA2_WSRM_COMMON_EXPIRES  "Expires"
 
-	#define SANDESHA2_WSRM_COMMON_CREATE_SEQUENCE  "CreateSequence"
+	#define SANDESHA2_WSRM_COMMON_CREATE_SEQ  "CreateSequence"
 
-	#define SANDESHA2_WSRM_COMMON_CREATE_SEQUENCE_RESPONSE  "CreateSequenceResponse"
+	#define SANDESHA2_WSRM_COMMON_CREATE_SEQ_RESPONSE  "CreateSequenceResponse"
 
 	#define SANDESHA2_WSRM_COMMON_ACK_REQUESTED  "AckRequested"
 
@@ -134,7 +134,7 @@
 
 	#define SANDESHA2_WSRM_COMMON_NACK  "Nack"
 
-	#define SANDESHA2_WSRM_COMMON_SEQUENCE_ACK  "SequenceAcknowledgement"
+	#define SANDESHA2_WSRM_COMMON_SEQ_ACK  "SequenceAcknowledgement"
 
 	#define SANDESHA2_WSRM_COMMON_IDENTIFIER  "Identifier"
 
@@ -160,8 +160,8 @@
 		SANDESHA2_MSG_TYPE_CREATE_SEQ_RESPONSE,
 		SANDESHA2_MSG_TYPE_APPLICATION,
 		SANDESHA2_MSG_TYPE_ACK,
-		SANDESHA2_MSG_TYPE_CLOSE_SEQUENCE,
-		SANDESHA2_MSG_TYPE_CLOSE_SEQUENCE_RESPONSE,
+		SANDESHA2_MSG_TYPE_CLOSE_SEQ,
+		SANDESHA2_MSG_TYPE_CLOSE_SEQ_RESPONSE,
 		SANDESHA2_MSG_TYPE_TERMINATE_SEQ,
 		SANDESHA2_MSG_TYPE_ACK_REQUEST,
 		SANDESHA2_MSG_TYPE_TERMINATE_SEQ_RESPONSE,
@@ -172,14 +172,14 @@
 	enum sandesha2_message_parts 
 	{
 		SANDESHA2_MSG_PART_UNKNOWN = 0,
-		SANDESHA2_MSG_PART_SEQUENCE,
+		SANDESHA2_MSG_PART_SEQ,
 		SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT,
 		SANDESHA2_MSG_PART_ADDR_HEADERS,
 		SANDESHA2_MSG_PART_CREATE_SEQ,
 		SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE,
 		SANDESHA2_MSG_PART_TERMINATE_SEQ,
-		SANDESHA2_MSG_PART_CLOSE_SEQUENCE,
-		SANDESHA2_MSG_PART_CLOSE_SEQUENCE_RESPONSE,
+		SANDESHA2_MSG_PART_CLOSE_SEQ,
+		SANDESHA2_MSG_PART_CLOSE_SEQ_RESPONSE,
 		SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE,
 		SANDESHA2_MSG_PART_ACK_REQUEST,
 		SANDESHA2_MSG_PART_MAX_MSG_PART_ID
@@ -190,19 +190,19 @@
 	 */		
 	#define SANDESHA2_SEQ_PROP_RM_SPEC_VERSION  "WSRMSpecVersion"
 
-	/* This is not a sequence property. This is used as the
-	 * sequenceId to share data b/w sequences
+	/* This is not a seq property. This is used as the
+	 * seqId to share data b/w seqs
 	 */
-	#define SANDESHA2_SEQ_PROP_ALL_SEQUENCES  "AllSequences"
+	#define SANDESHA2_SEQ_PROP_ALL_SEQS  "AllSequences"
 		
-	/* Addressing version of a sequence. All messages of a sequence should 
+	/* Addressing version of a seq. All messages of a seq should 
 	 * have this addressing version
 	 */
 	#define SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE  "AddressingNamespaceValue"
 
-	/* For incoming sequences this gives the msg no's of the messages that were
+	/* For incoming seqs this gives the msg no's of the messages that were
 	 * received (may be an ack was sent - depending on the policy)
-	 * For out going sequences this gives the messages that were sent and that 
+	 * For out going seqs this gives the messages that were sent and that 
 	 * were successfully acked by the other end point.
 	 */
 	#define SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES  "ClientCompletedMessages"
@@ -213,23 +213,23 @@
 
 	#define SANDESHA2_SEQ_PROP_ACKS_TO_EPR  "acksToEPR"
 
-	#define SANDESHA2_SEQ_PROP_OUT_SEQUENCE_ID  "OutSequenceId"
+	#define SANDESHA2_SEQ_PROP_OUT_SEQ_ID  "OutSequenceId"
 
-	#define SANDESHA2_SEQ_PROP_INTERNAL_SEQUENCE_ID  "TempSequenceId"
+	#define SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID  "TempSequenceId"
 
 	#define SANDESHA2_SEQ_PROP_REPLY_TO_EPR  "ReplyToEPR"
 
 	#define SANDESHA2_SEQ_PROP_APP_MSG_PROCESSOR_LIST  "AppMsgProcessorList"
 
-	#define SANDESHA2_SEQ_PROP_OUT_CREATE_SEQUENCE_SENT  "OutCreateSeqSent"
+	#define SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT  "OutCreateSeqSent"
 
 	#define SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER  "NextMsgNo"
 
-	#define SANDESHA2_SEQ_PROP_INCOMING_SEQUENCE_LIST  "IncomingSequenceList"
+	#define SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST  "IncomingSequenceList"
 
 	#define SANDESHA2_SEQ_PROP_CHECK_RESPONSE  "CheckResponse"
 
-	#define SANDESHA2_SEQ_PROP_OFFERED_SEQUENCE  "OfferedSequence"
+	#define SANDESHA2_SEQ_PROP_OFFERED_SEQ  "OfferedSequence"
 
 	#define SANDESHA2_SEQ_PROP_TERMINATE_ADDED  "TerminateAdded"
 		
@@ -243,15 +243,15 @@
 		
 	#define SANDESHA2_SEQ_PROP_OUT_SEQ_ACKSTO  "OutSequenceAcksTo"
 		
-	#define SANDESHA2_SEQ_PROP_SEQUENCE_CLOSED  "SequenceClosed"
+	#define SANDESHA2_SEQ_PROP_SEQ_CLOSED  "SequenceClosed"
 		
-	#define SANDESHA2_SEQ_PROP_SEQUENCE_TERMINATED  "SequenceTerminated"
+	#define SANDESHA2_SEQ_PROP_SEQ_TERMINATED  "SequenceTerminated"
 		
-	#define SANDESHA2_SEQ_PROP_SEQUENCE_TIMED_OUT  "SequenceTimedOut"
+	#define SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT  "SequenceTimedOut"
 		
 	#define SANDESHA2_SEQ_PROP_LAST_MESSAGE  "LastMessage"
 
-	#define SANDESHA2_SEQ_PROP_REQUEST_SIDE_SEQUENCE_ID  "RequestSideSequenceID" 		//used only at the server side
+	#define SANDESHA2_SEQ_PROP_REQUEST_SIDE_SEQ_ID  "RequestSideSequenceID" 		//used only at the server side
 		
 	#define SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER  "HighestInMsgNumber"
 		
@@ -296,7 +296,7 @@
 
 	#define SANDESHA2_BEAN_MAP_RETRANSMITTER  "RetransmitterBeanMap"
 
-	#define SANDESHA2_BEAN_MAP_SEQUENCE_PROPERTY  "SequencePropertyBeanMap"
+	#define SANDESHA2_BEAN_MAP_SEQ_PROPERTY  "SequencePropertyBeanMap"
 
 	#define SANDESHA2_BEAN_MAP_STORAGE_MAP  "StorageMapBeanMap"
 
@@ -306,11 +306,11 @@
 	 * SOAP Faults
 	 */
 	/* Fault subcodes */
-	#define SANDESHA2_SOAP_FAULT_SUBCODE_SEQUENCE_TERMINATED  "wsrm:SequenceTerminated"
+	#define SANDESHA2_SOAP_FAULT_SUBCODE_SEQ_TERMINATED  "wsrm:SequenceTerminated"
 			
-	#define SANDESHA2_SOAP_FAULT_SUBCODE_SEQUENCE_CLOSED  "wsrm:SequenceClosed"
+	#define SANDESHA2_SOAP_FAULT_SUBCODE_SEQ_CLOSED  "wsrm:SequenceClosed"
 
-	#define SANDESHA2_SOAP_FAULT_SUBCODE_UNKNOWN_SEQUENCE  "wsrm:UnknownSequence"
+	#define SANDESHA2_SOAP_FAULT_SUBCODE_UNKNOWN_SEQ  "wsrm:UnknownSequence"
 
 	#define SANDESHA2_SOAP_FAULT_SUBCODE_INVALID_ACKNOWLEDGEMENT  "wsrm:InvalidAcknowledgement"
 
@@ -318,16 +318,16 @@
 
 	#define SANDESHA2_SOAP_FAULT_SUBCODE_LAST_MESSAGE_NO_EXCEEDED  "wsrm:LastMessageNumberExceeded"
 
-	#define SANDESHA2_SOAP_FAULT_SUBCODE_CREATE_SEQUENCE_REFUSED  "wsrm:CreateSequenceRefused"
+	#define SANDESHA2_SOAP_FAULT_SUBCODE_CREATE_SEQ_REFUSED  "wsrm:CreateSequenceRefused"
 	
 	/* Fault Types */
-	#define SANDESHA2_SOAP_FAULT_TYPE_UNKNOWN_SEQUENCE  1
+	#define SANDESHA2_SOAP_FAULT_TYPE_UNKNOWN_SEQ  1
 
 	#define SANDESHA2_SOAP_FAULT_TYPE_MESSAGE_NUMBER_ROLLOVER  2
 
 	#define SANDESHA2_SOAP_FAULT_TYPE_INVALID_ACKNOWLEDGEMENT  3
 
-	#define SANDESHA2_SOAP_FAULT_TYPE_CREATE_SEQUENCE_REFUSED  4
+	#define SANDESHA2_SOAP_FAULT_TYPE_CREATE_SEQ_REFUSED  4
 			
 	#define SANDESHA2_SOAP_FAULT_TYPE_LAST_MESSAGE_NO_EXCEEDED  5
 
@@ -343,11 +343,11 @@
 		
 	#define SANDESHA2_PROPERTIES_INACTIVETIMEOUT_MEASURE  "InactivityTimeoutMeasure"
 		
-	#define SANDESHA2_PROPERTIES_STORAGE_MANAGER  "StorageManager"
+	#define SANDESHA2_PROPERTIES_STORAGE_MGR  "StorageManager"
 		
-	#define SANDESHA2_PROPERTIES_IN_MEMORY_STORAGE_MANAGER  "InMemoryStorageManager"
+	#define SANDESHA2_PROPERTIES_IN_MEMORY_STORAGE_MGR  "InMemoryStorageManager"
 		
-	#define SANDESHA2_PROPERTIES_PERM_STORAGE_MANAGER  "PermanentStorageManager"
+	#define SANDESHA2_PROPERTIES_PERM_STORAGE_MGR  "PermanentStorageManager"
 		
 	#define SANDESHA2_PROPERTIES_INORDER_INVOCATION  "InvokeInOrder"
 		
@@ -369,11 +369,11 @@
 			
 	#define SANDESHA2_DEF_VAL_INACTIVETIMEOUT_MEASURE  "seconds"   //this can be - seconds,minutes,hours,days
 			
-	#define SANDESHA2_DEF_VAL_STORAGE_MANAGER  "InMemoryStorageManager"
+	#define SANDESHA2_DEF_VAL_STORAGE_MGR  "InMemoryStorageManager"
 		
-	#define SANDESHA2_DEF_VAL_IN_MEMORY_STORAGE_MANAGER  "InMemoryStorageManager"
+	#define SANDESHA2_DEF_VAL_IN_MEMORY_STORAGE_MGR  "InMemoryStorageManager"
 			
-	#define SANDESHA2_DEF_VAL_PERM_STORAGE_MANAGER  "InMemoryStorageManager"
+	#define SANDESHA2_DEF_VAL_PERM_STORAGE_MGR  "InMemoryStorageManager"
 			
 	#define SANDESHA2_DEF_VAL_INORDER_INVOCATION  true
 			
@@ -401,7 +401,7 @@
 
 	#define SANDESHA2_TERMINATE_DELAY  100
 
-	#define SANDESHA2_TEMP_SEQUENCE_ID  "uuid:tempID"
+	#define SANDESHA2_TEMP_SEQ_ID  "uuid:tempID"
 
 	#define SANDESHA2_ACK_PROCSSED  "AckProcessed"
 
@@ -434,7 +434,7 @@
 	
 	#define SANDESHA2_EXECUTIN_CHAIN_SEPERATOR  "."
 	
-	#define SANDESHA2_INTERNAL_SEQUENCE_PREFIX  "Sandesha2InternalSequence"
+	#define SANDESHA2_INTERNAL_SEQ_PREFIX  "Sandesha2InternalSequence"
 	
 	#define SANDESHA2_SANDESHA_PROPERTY_BEAN  "Sandesha2PropertyBean"
 	
@@ -442,11 +442,11 @@
 	
 	#define SANDESHA2_LIST_PART_SEPERATOR "-"
 	
-	#define SANDESHA2_INMEMORY_STORAGE_MANAGER  "inmemory"
+	#define SANDESHA2_INMEMORY_STORAGE_MGR  "inmemory"
 	
-	#define SANDESHA2_PERMANENT_STORAGE_MANAGER  "persistent"
+	#define SANDESHA2_PERMANENT_STORAGE_MGR  "persistent"
 	
-	#define SANDESHA2_DEFAULT_STORAGE_MANAGER "inmemory"
+	#define SANDESHA2_DEFAULT_STORAGE_MGR "inmemory"
 	
 	#define SANDESHA2_SENDER  "Sender"
 	
@@ -454,7 +454,7 @@
 	
 	#define SANDESHA2_WITHIN_TRANSACTION  "WithinTransaction"
 	
-	#define SANDESHA2_STORAGE_MANAGER_PARAMETER   "Sandesha2StorageManager"
+	#define SANDESHA2_STORAGE_MGR_PARAMETER   "Sandesha2StorageManager"
 	
 	#define SANDESHA2_POST_FAILURE_MESSAGE  "PostFailureMessage"
 	

Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_error.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_error.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_error.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_error.h Tue Jul 11 05:42:25 2006
@@ -69,8 +69,8 @@
         SANDESHA2_ERROR_KEY_IS_NULL,
         /* Ack None now allowed in the spec */
         SANDESHA2_ERROR_ACK_NONE_NOT_ALLOWED,
-        /* unknown storage manager */
-        SANDESHA2_ERROR_UNKNOWN_STORAGE_MANAGER,
+        /* unknown storage mgr */
+        SANDESHA2_ERROR_UNKNOWN_STORAGE_MGR,
         /* Sandesha configuration is not set in axis2 conf*/
         SANDESHA2_ERROR_CONFIGURATION_NOT_SET,
         /* NULL msg context */
@@ -79,7 +79,7 @@
         SANDESHA2_ERROR_SENDING_FAULT,
         /* Invalid message number specified */
         SANDESHA2_ERROR_INVALID_MSG_NUM,
-        /* Specified sequence does not exist */
+        /* Specified seq does not exist */
         SANDESHA2_ERROR_SEQ_NOT_EXIST,
         /* RM Spec version is invalid */
         SANDESHA2_ERROR_INVALID_SPEC_VERSION,
@@ -90,7 +90,7 @@
         /* NULL to epr is specified */
         SANDESHA2_ERROR_NULL_TO,
         /* NULL sequnce given for processing */
-        SANDESHA2_ERROR_NULL_SEQUENCE,
+        SANDESHA2_ERROR_NULL_SEQ,
         /* Storage Map not present */
         SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT,
         /* Entry is not present for updating */

Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h Tue Jul 11 05:42:25 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
  
-#ifndef SANDESHA2_FAULT_MANAGER_H
-#define SANDESHA2_FAULT_MANAGER_H
+#ifndef SANDESHA2_FAULT_MGR_H
+#define SANDESHA2_FAULT_MGR_H
 
 /**
-  * @file sandesha2_fault_manager.h
+  * @file sandesha2_fault_mgr.h
   * @brief 
   */
 
@@ -26,7 +26,7 @@
 #include <axis2_env.h>
 #include <axis2_conf_ctx.h>
 #include <sandesha2/sandesha2_msg_ctx.h>
-#include <sandesha2/sandesha2_storage_manager.h>
+#include <sandesha2/sandesha2_storage_mgr.h>
 #include <sandesha2/sandesha2_fault_data.h>
 #include <axis2_msg_ctx.h>
 
@@ -41,121 +41,121 @@
  * @{
  */
  
- typedef struct sandesha2_fault_manager_ops sandesha2_fault_manager_ops_t;
- typedef struct sandesha2_fault_manager sandesha2_fault_manager_t;
+ typedef struct sandesha2_fault_mgr_ops sandesha2_fault_mgr_ops_t;
+ typedef struct sandesha2_fault_mgr sandesha2_fault_mgr_t;
  /**
  * @brief Sandesha2 Fault Manager ops struct
- * Encapsulator struct for ops of sandesha2_fault_manager
+ * Encapsulator struct for ops of sandesha2_fault_mgr
  */
-AXIS2_DECLARE_DATA struct sandesha2_fault_manager_ops
+AXIS2_DECLARE_DATA struct sandesha2_fault_mgr_ops
 {
     
     sandesha2_msg_ctx_t* (AXIS2_CALL *
         check_for_create_seq_refused) 
-            (sandesha2_fault_manager_t *fault_mgr,
+            (sandesha2_fault_mgr_t *fault_mgr,
             const axis2_env_t *env,
             axis2_msg_ctx_t *create_seq_msg,
-            sandesha2_storage_manager_t *storage_man);
+            sandesha2_storage_mgr_t *storage_man);
             
     sandesha2_msg_ctx_t* (AXIS2_CALL *
         check_for_last_msg_num_exceeded) 
-            (sandesha2_fault_manager_t *fault_mgr,
+            (sandesha2_fault_mgr_t *fault_mgr,
             const axis2_env_t *env,
             sandesha2_msg_ctx_t *app_rm_msg,
-            sandesha2_storage_manager_t *storage_man);
+            sandesha2_storage_mgr_t *storage_man);
             
     sandesha2_msg_ctx_t* (AXIS2_CALL *
         check_for_msg_num_rollover) 
-            (sandesha2_fault_manager_t *fault_mgr,
+            (sandesha2_fault_mgr_t *fault_mgr,
             const axis2_env_t *env,
             sandesha2_msg_ctx_t *create_seq_msg,
-            sandesha2_storage_manager_t *storage_man);
+            sandesha2_storage_mgr_t *storage_man);
 
     sandesha2_msg_ctx_t* (AXIS2_CALL *
         check_for_unknown_seq) 
-            (sandesha2_fault_manager_t *fault_mgr,
+            (sandesha2_fault_mgr_t *fault_mgr,
             const axis2_env_t *env,
             sandesha2_msg_ctx_t *create_seq_msg,
             axis2_char_t *seq_id,
-            sandesha2_storage_manager_t *storage_man);
+            sandesha2_storage_mgr_t *storage_man);
 
     sandesha2_msg_ctx_t* (AXIS2_CALL *
         check_for_invalid_ack) 
-            (sandesha2_fault_manager_t *fault_mgr,
+            (sandesha2_fault_mgr_t *fault_mgr,
             const axis2_env_t *env,
             sandesha2_msg_ctx_t *ack_rm_msg,
-            sandesha2_storage_manager_t *storage_man);
+            sandesha2_storage_mgr_t *storage_man);
 
     sandesha2_msg_ctx_t* (AXIS2_CALL *
         check_for_seq_closed) 
-            (sandesha2_fault_manager_t *fault_mgr,
+            (sandesha2_fault_mgr_t *fault_mgr,
             const axis2_env_t *env,
             sandesha2_msg_ctx_t *create_seq_msg,
             axis2_char_t *seq_id,
-            sandesha2_storage_manager_t *storage_man);
+            sandesha2_storage_mgr_t *storage_man);
 
     sandesha2_msg_ctx_t* (AXIS2_CALL *
         get_fault) 
-            (sandesha2_fault_manager_t *fault_mgr,
+            (sandesha2_fault_mgr_t *fault_mgr,
             const axis2_env_t *env,
             sandesha2_msg_ctx_t *create_seq_msg,
             sandesha2_fault_data_t *fault_data,
             axis2_char_t *addr_ns_uri,
-            sandesha2_storage_manager_t *storage_man);
+            sandesha2_storage_mgr_t *storage_man);
 
     axis2_status_t (AXIS2_CALL *
         free) 
-            (sandesha2_fault_manager_t *fault_mgr,
+            (sandesha2_fault_mgr_t *fault_mgr,
             const axis2_env_t *env);
 };
 
 /**
- * @brief sandesha2_fault_manager_ops
- *    sandesha2_fault_manager_ops
+ * @brief sandesha2_fault_mgr_ops
+ *    sandesha2_fault_mgr_ops
  */
-AXIS2_DECLARE_DATA struct sandesha2_fault_manager
+AXIS2_DECLARE_DATA struct sandesha2_fault_mgr
 {
-    sandesha2_fault_manager_ops_t *ops;
+    sandesha2_fault_mgr_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_fault_manager_t* AXIS2_CALL
-sandesha2_fault_manager_create(
+AXIS2_EXTERN sandesha2_fault_mgr_t* AXIS2_CALL
+sandesha2_fault_mgr_create(
 						const axis2_env_t *env);
                         
 /************************** Start of function macros **************************/
-#define SANDESHA2_FAULT_MANAGER_FREE(fault_mgr, env) \
+#define SANDESHA2_FAULT_MGR_FREE(fault_mgr, env) \
     ((fault_mgr)->ops->free (fault_mgr, env))
     
-#define SANDESHA2_FAULT_MANAGER_CHECK_FOR_CREATE_SEQ_REFUSED(fault_mgr, env, \
+#define SANDESHA2_FAULT_MGR_CHECK_FOR_CREATE_SEQ_REFUSED(fault_mgr, env, \
     msg, storage_man) \
     ((fault_mgr)->ops->check_for_create_seq_refused(fault_mgr, env, msg, \
     storage_man))
     
-#define SANDESHA2_FAULT_MANAGER_CHECK_FOR_LAST_MSG_NUM_EXCEEDED(fault_mgr, \
+#define SANDESHA2_FAULT_MGR_CHECK_FOR_LAST_MSG_NUM_EXCEEDED(fault_mgr, \
     env, msg, storage_man) \
     ((fault_mgr)->ops->check_for_last_msg_num_exceeded(fault_mgr, env, msg, \
     storage_man))
     
-#define SANDESHA2_FAULT_MANAGER_CHECK_FOR_MSG_NUM_ROLLOVER(fault_mgr, \
+#define SANDESHA2_FAULT_MGR_CHECK_FOR_MSG_NUM_ROLLOVER(fault_mgr, \
     env, msg, storage_man) \
     ((fault_mgr)->ops->check_for_msg_num_rollover(fault_mgr, env, msg, \
     storage_man))
     
-#define SANDESHA2_FAULT_MANAGER_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env, msg, \
+#define SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env, msg, \
     seq_id, storage_man) \
     ((fault_mgr)->ops->check_for_unknown_seq(fault_mgr, env, msg, seq_id, \
     storage_man))
     
-#define SANDESHA2_FAULT_MANAGER_CHECK_FOR_INVALID_ACK(fault_mgr, env, msg, \
+#define SANDESHA2_FAULT_MGR_CHECK_FOR_INVALID_ACK(fault_mgr, env, msg, \
     storage_man) \
     ((fault_mgr)->ops->check_for_invalid_ack(fault_mgr, env, msg, storage_man))
     
-#define SANDESHA2_FAULT_MANAGER_CHECK_FOR_SEQ_CLOSED(fault_mgr, env, msg, \
+#define SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_mgr, env, msg, \
     seq_id, storage_man) \
     ((fault_mgr)->ops->check_for_seq_closed(fault_mgr, env, msg, seq_id, \
     storage_man))
 
-#define SANDESHA2_FAULT_MANAGER_GET_FAULT(fault_mgr, env, msg, fault_data,\
+#define SANDESHA2_FAULT_MGR_GET_FAULT(fault_mgr, env, msg, fault_data,\
     addr_ns_uri, storage_man) \
     ((fault_mgr)->ops->get_fault(fault_mgr, env, msg, fault_data, addr_ns_uri, \
     storage_man))
@@ -166,4 +166,4 @@
 }
 #endif
 
-#endif /*SANDESHA2_FAULT_MANAGER_H*/
+#endif /*SANDESHA2_FAULT_MGR_H*/

Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_property_bean.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_property_bean.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_property_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_property_bean.h Tue Jul 11 05:42:25 2006
@@ -97,26 +97,26 @@
             axis2_bool_t exp_backoff);
             
     axis2_char_t* (AXIS2_CALL *
-        get_in_mem_storage_manager) 
+        get_in_mem_storage_mgr) 
             (sandesha2_property_bean_t *bean,
             const axis2_env_t *env);
             
     axis2_status_t (AXIS2_CALL *
-        set_in_mem_storage_manager) 
+        set_in_mem_storage_mgr) 
             (sandesha2_property_bean_t *bean,
             const axis2_env_t *env,
-            axis2_char_t *manager);
+            axis2_char_t *mgr);
             
     axis2_char_t* (AXIS2_CALL *
-        get_permanent_storage_manager) 
+        get_permanent_storage_mgr) 
             (sandesha2_property_bean_t *bean,
             const axis2_env_t *env);
             
     axis2_status_t (AXIS2_CALL *
-        set_permanent_storage_manager) 
+        set_permanent_storage_mgr) 
             (sandesha2_property_bean_t *bean,
             const axis2_env_t *env,
-            axis2_char_t *manager);
+            axis2_char_t *mgr);
             
     axis2_bool_t (AXIS2_CALL *
         is_in_order) 
@@ -209,17 +209,17 @@
 #define SANDESHA2_PROPERTY_BEAN_SET_EXP_BACKOFF(bean, env, backoff)\
     ((bean)->ops->set_exp_backoff(bean, env, backoff))
     
-#define SANDESHA2_PROPERTY_BEAN_GET_IN_MEM_STORAGE_MANAGER(bean, env)\
-    ((bean)->ops->get_in_mem_storage_manager(bean, env))
+#define SANDESHA2_PROPERTY_BEAN_GET_IN_MEM_STORAGE_MGR(bean, env)\
+    ((bean)->ops->get_in_mem_storage_mgr(bean, env))
     
-#define SANDESHA2_PROPERTY_BEAN_SET_IN_MEM_STORAGE_MANAGER(bean, env, manager)\
-    ((bean)->ops->set_in_mem_storage_manager(bean, env, manager))
+#define SANDESHA2_PROPERTY_BEAN_SET_IN_MEM_STORAGE_MGR(bean, env, mgr)\
+    ((bean)->ops->set_in_mem_storage_mgr(bean, env, mgr))
     
-#define SANDESHA2_PROPERTY_BEAN_GET_PERMENENT_STORAGE_MANAGER(bean, env)\
-    ((bean)->ops->get_permanent_storage_manager(bean, env))
+#define SANDESHA2_PROPERTY_BEAN_GET_PERMENENT_STORAGE_MGR(bean, env)\
+    ((bean)->ops->get_permanent_storage_mgr(bean, env))
     
-#define SANDESHA2_PROPERTY_BEAN_SET_PERMENENT_STORAGE_MANAGER(bean, env, manager)\
-    ((bean)->ops->get_permanent_storage_manager(bean, env, manager))
+#define SANDESHA2_PROPERTY_BEAN_SET_PERMENENT_STORAGE_MGR(bean, env, mgr)\
+    ((bean)->ops->get_permanent_storage_mgr(bean, env, mgr))
     
 #define SANDESHA2_PROPERTY_BEAN_IS_IN_ORDER(bean, env)\
     ((bean)->ops->is_in_order(bean, env))

Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sequence.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sequence.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sequence.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sequence.h Tue Jul 11 05:42:25 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
  
-#ifndef SANDESHA2_SEQUENCE_H
-#define SANDESHA2_SEQUENCE_H
+#ifndef SANDESHA2_SEQ_H
+#define SANDESHA2_SEQ_H
 
 /**
-  * @file sandesha2_sequence.h
+  * @file sandesha2_seq.h
   * @brief 
   */
 
@@ -35,97 +35,97 @@
 {
 #endif
 
-/** @defgroup sandesha2_sequence
+/** @defgroup sandesha2_seq
  * @ingroup sandesha2_wsrm
  * @{
  */
     
-typedef struct sandesha2_sequence_ops sandesha2_sequence_ops_t;
-typedef struct sandesha2_sequence sandesha2_sequence_t;
+typedef struct sandesha2_seq_ops sandesha2_seq_ops_t;
+typedef struct sandesha2_seq sandesha2_seq_t;
  
 /**
  * @brief Sequence ops struct
- * Encapsulator struct for ops of sandesha2_sequence
+ * Encapsulator struct for ops of sandesha2_seq
  */
-AXIS2_DECLARE_DATA struct sandesha2_sequence_ops
+AXIS2_DECLARE_DATA struct sandesha2_seq_ops
 {
     sandesha2_identifier_t * (AXIS2_CALL *
         get_identifier)
-            (sandesha2_sequence_t *sequence,
+            (sandesha2_seq_t *seq,
             const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
         set_identifier)
-            (sandesha2_sequence_t *sequence,
+            (sandesha2_seq_t *seq,
             const axis2_env_t *env, 
             sandesha2_identifier_t *identifier);
             
     sandesha2_msg_number_t * (AXIS2_CALL *
         get_msg_num)
-            (sandesha2_sequence_t *sequence,
+            (sandesha2_seq_t *seq,
             const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
         set_msg_num)
-            (sandesha2_sequence_t *sequence,
+            (sandesha2_seq_t *seq,
             const axis2_env_t *env, 
             sandesha2_msg_number_t *msg_num);
                     	
     sandesha2_last_msg_t * (AXIS2_CALL *
         get_last_msg)
-            (sandesha2_sequence_t *sequence,
+            (sandesha2_seq_t *seq,
             const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
         set_last_msg)
-            (sandesha2_sequence_t *sequence,
+            (sandesha2_seq_t *seq,
             const axis2_env_t *env, 
             sandesha2_last_msg_t *last_msg);
 
     axis2_bool_t (AXIS2_CALL *
         is_must_understand)
-            (sandesha2_sequence_t *sequence,
+            (sandesha2_seq_t *seq,
             const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
         set_must_understand)
-            (sandesha2_sequence_t *sequence,
+            (sandesha2_seq_t *seq,
             const axis2_env_t *env, 
             axis2_bool_t mu);
 };
 
 /**
- * @brief sandesha2_sequence
- *    sandesha2_sequence
+ * @brief sandesha2_seq
+ *    sandesha2_seq
  */
-AXIS2_DECLARE_DATA struct sandesha2_sequence
+AXIS2_DECLARE_DATA struct sandesha2_seq
 {
     sandesha2_iom_rm_part_t part;
-    sandesha2_sequence_ops_t *ops;
+    sandesha2_seq_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_sequence_t* AXIS2_CALL
-sandesha2_sequence_create(
+AXIS2_EXTERN sandesha2_seq_t* AXIS2_CALL
+sandesha2_seq_create(
 						const axis2_env_t *env, 
 					    axis2_char_t *ns_value);
 /************************** Start of function macros **************************/
-#define SANDESHA2_SEQUENCE_SET_IDENTIFIER(sequence, env, identifier) \
-    ((sequence)->ops->set_identifier (sequence, env, identifier))
-#define SANDESHA2_SEQUENCE_GET_IDENTIFIER(sequence, env) \
-    ((sequence)->ops->get_identifier (sequence, env))
-#define SANDESHA2_SEQUENCE_GET_MSG_NUM(sequence, env) \
-    ((sequence)->ops->get_msg_num (sequence, env))
-#define SANDESHA2_SEQUENCE_SET_MSG_NUM(sequence, env, msg_num) \
-    ((sequence)->ops->set_msg_num (sequence, env, msg_num))
-#define SANDESHA2_SEQUENCE_SET_LAST_MSG(sequence, env, last_msg) \
-    ((sequence)->ops->set_last_msg (sequence, env, last_msg))
-#define SANDESHA2_SEQUENCE_GET_LAST_MSG(sequence, env) \
-    ((sequence)->ops->get_last_msg (sequence, env))
+#define SANDESHA2_SEQ_SET_IDENTIFIER(seq, env, identifier) \
+    ((seq)->ops->set_identifier (seq, env, identifier))
+#define SANDESHA2_SEQ_GET_IDENTIFIER(seq, env) \
+    ((seq)->ops->get_identifier (seq, env))
+#define SANDESHA2_SEQ_GET_MSG_NUM(seq, env) \
+    ((seq)->ops->get_msg_num (seq, env))
+#define SANDESHA2_SEQ_SET_MSG_NUM(seq, env, msg_num) \
+    ((seq)->ops->set_msg_num (seq, env, msg_num))
+#define SANDESHA2_SEQ_SET_LAST_MSG(seq, env, last_msg) \
+    ((seq)->ops->set_last_msg (seq, env, last_msg))
+#define SANDESHA2_SEQ_GET_LAST_MSG(seq, env) \
+    ((seq)->ops->get_last_msg (seq, env))
 /************************** End of function macros ****************************/
 /** @} */
 #ifdef __cplusplus
 }
 #endif
 
-#endif                          /* SANDESHA2_SEQUENCE_H */
+#endif                          /* SANDESHA2_SEQ_H */
 

Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h Tue Jul 11 05:42:25 2006
@@ -41,24 +41,24 @@
  * @ingroup sandesha2_util
  * @{
  */
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
 
 AXIS2_EXTERN long AXIS2_CALL
-sandesha2_util_get_current_time_in_millis(
+sandesha2_utils_get_current_time_in_millis(
         const axis2_env_t *env);
 
-#define sandesha2_util_get_current_time_in_millis SANDESHA2_UTIL_GET_CURRENT_TIME_IN_MILLIS
+#define sandesha2_utils_get_current_time_in_millis SANDESHA2_UTILS_GET_CURRENT_TIME_IN_MILLIS
 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 sandesha2_utils_remove_soap_body_part(const axis2_env_t *env, 
                         axiom_soap_envelope_t *envelope, axis2_qname_t *qname);
                         
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 sandesha2_utils_get_rm_version(const axis2_env_t *env,
                         axis2_char_t *key,
-                        sandesha2_storage_manager_t *storage_man);
+                        sandesha2_storage_mgr_t *storage_man);
                         
-AXIS2_EXTERN sandesha2_storage_manager_t* AXIS2_CALL
-sandesha2_utils_get_storage_manager(const axis2_env_t *env,
+AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
+sandesha2_utils_get_storage_mgr(const axis2_env_t *env,
                         axis2_conf_ctx_t *conf_ctx,
                         axis2_conf_t *conf);
                         
@@ -66,7 +66,7 @@
 sandesha2_utils_get_seq_property(const axis2_env_t *env,
                         axis2_char_t *id,
                         axis2_char_t *name,
-                        sandesha2_storage_manager_t *storage_man);
+                        sandesha2_storage_mgr_t *storage_man);
 
 AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
 sandesha2_utils_get_property_bean(const axis2_env_t *env,
@@ -97,12 +97,12 @@
 AXIS2_EXTERN axis2_transport_out_desc_t* AXIS2_CALL
 sandesha2_utils_get_transport_out(const axis2_env_t *env);
 
-AXIS2_EXTERN sandesha2_storage_manager_t* AXIS2_CALL
-sandesha2_utils_get_inmemory_storage_manager(const axis2_env_t *env,
+AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
+sandesha2_utils_get_inmemory_storage_mgr(const axis2_env_t *env,
                         axis2_conf_ctx_t *conf_ctx);
                         
-AXIS2_EXTERN sandesha2_storage_manager_t* AXIS2_CALL
-sandesha2_utils_get_permanent_storage_manager(const axis2_env_t *env,
+AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
+sandesha2_utils_get_permanent_storage_mgr(const axis2_env_t *env,
                         axis2_conf_ctx_t *conf_ctx);
 
 /** @} */

Copied: webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h (from r420800, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_next_msg_bean.h)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h?p2=webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h&p1=webservices/sandesha/trunk/c/include/sandesha2/sandesha2_next_msg_bean.h&r1=420800&r2=420822&rev=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_next_msg_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h Tue Jul 11 05:42:25 2006
@@ -35,10 +35,10 @@
 				const axis2_env_t *env);
 
 	axis2_char_t* (AXIS2_CALL *
-		get_sequence_id) (struct sandesha2_next_msg_bean *next_msg_bean,
+		get_seq_id) (struct sandesha2_next_msg_bean *next_msg_bean,
 				const axis2_env_t *env);
 	void (AXIS2_CALL *
-		set_sequence_id) (struct sandesha2_next_msg_bean *next_msg_bean,
+		set_seq_id) (struct sandesha2_next_msg_bean *next_msg_bean,
 				const axis2_env_t *env, axis2_char_t *seq_id);
 
 	long (AXIS2_CALL *
@@ -68,11 +68,11 @@
 #define SANDESHA2_NEXT_MSG_BEAN_FREE(next_msg_bean, env) \
 	(next_msg_bean)->ops->free(next_msg_bean, env)
 
-#define SANDESHA2_NEXT_MSG_BEAN_GET_SEQUENCE_ID(next_msg_bean, env) \
-	(next_msg_bean)->ops->get_sequence_id(next_msg_bean, env)
+#define SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(next_msg_bean, env) \
+	(next_msg_bean)->ops->get_seq_id(next_msg_bean, env)
 
-#define SANDESHA2_NEXT_MSG_BEAN_SET_SEQUENCE_ID(next_msg_bean, env, seq_id) \
-	(next_msg_bean)->ops->set_sequence_id(next_msg_bean, env, seq_id)
+#define SANDESHA2_NEXT_MSG_BEAN_SET_SEQ_ID(next_msg_bean, env, seq_id) \
+	(next_msg_bean)->ops->set_seq_id(next_msg_bean, env, seq_id)
 
 #define SANDESHA2_NEXT_MSG_BEAN_GET_NEXT_MSG_NO_TO_PROCESS(next_msg_bean, env) \
 	(next_msg_bean)->ops->get_next_msg_no_to_process(next_msg_bean, env)

Copied: webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h (from r420800, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sender_bean.h)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h?p2=webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h&p1=webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sender_bean.h&r1=420800&r2=420822&rev=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sender_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h Tue Jul 11 05:42:25 2006
@@ -116,13 +116,13 @@
 			int msg_type);
 
 	axis2_char_t *(AXIS2_CALL *
-		get_sequence_id)(sandesha2_sender_bean_t *sender,
+		get_seq_id)(sandesha2_sender_bean_t *sender,
 			const axis2_env_t *env);
 
 	void (AXIS2_CALL *
-		set_sequence_id) (sandesha2_sender_bean_t *sender,
+		set_seq_id) (sandesha2_sender_bean_t *sender,
 			const axis2_env_t *env,
-			axis2_char_t *sequence_id);
+			axis2_char_t *seq_id);
 
 };
 
@@ -205,11 +205,11 @@
 #define SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(sender_bean, env, msg_type) \
 	((sender_bean)->ops->set_msg_type(sender_bean, env, msg_type))
 	 
-#define SANDESHA2_SENDER_BEAN_GET_SEQUENCE_ID(sender_bean, env) \
-	((sender_bean)->ops->get_sequence_id(sender_bean, env))
+#define SANDESHA2_SENDER_BEAN_GET_SEQ_ID(sender_bean, env) \
+	((sender_bean)->ops->get_seq_id(sender_bean, env))
 	 
-#define SANDESHA2_SENDER_BEAN_SET_SEQUENCE_ID(sender_bean, env, seq_id) \
-	((sender_bean)->ops->set_sequence_id(sender_bean, env, seq_id))
+#define SANDESHA2_SENDER_BEAN_SET_SEQ_ID(sender_bean, env, seq_id) \
+	((sender_bean)->ops->set_seq_id(sender_bean, env, seq_id))
 	 
 
 #ifdef __cplusplus

Copied: webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h (from r420800, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_seq_property_bean.h)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h?p2=webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h&p1=webservices/sandesha/trunk/c/include/sandesha2/sandesha2_seq_property_bean.h&r1=420800&r2=420822&rev=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_seq_property_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h Tue Jul 11 05:42:25 2006
@@ -44,11 +44,11 @@
 			axis2_char_t *name);
 
 	axis2_char_t *(AXIS2_CALL *
-		get_sequence_id) (struct sandesha2_seq_property_bean *seq_property,
+		get_seq_id) (struct sandesha2_seq_property_bean *seq_property,
 			const axis2_env_t *env);
 
 	void (AXIS2_CALL *
-		set_sequence_id) (struct sandesha2_seq_property_bean *seq_property,
+		set_seq_id) (struct sandesha2_seq_property_bean *seq_property,
 			const axis2_env_t *env,
 			axis2_char_t *seq_id);
 	
@@ -89,11 +89,11 @@
 #define SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(seq_prop_bean, env, name) \
 	((seq_prop_bean)->ops->set_name(seq_prop_bean, env, name))
 
-#define SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQUENCE_ID(seq_prop_bean, env) \
-	((seq_prop_bean)->ops->get_sequence_id(seq_prop_bean, env))
+#define SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(seq_prop_bean, env) \
+	((seq_prop_bean)->ops->get_seq_id(seq_prop_bean, env))
 
-#define SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQUENCE_ID(seq_prop_bean, env, seq_id) \
-	((seq_prop_bean)->ops->set_sequence_id(seq_prop_bean, env, seq_id))
+#define SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(seq_prop_bean, env, seq_id) \
+	((seq_prop_bean)->ops->set_seq_id(seq_prop_bean, env, seq_id))
 
 #define SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(seq_prop_bean, env) \
 	((seq_prop_bean)->ops->get_value(seq_prop_bean, env))

Modified: webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h Tue Jul 11 05:42:25 2006
@@ -29,7 +29,7 @@
 #include <axis2_utils.h>
 #include <axis2_ctx.h>
 #include <axis2_array_list.h>
-#include <sandesha2_sequence_property_bean.h>
+#include <sandesha2_seq_property_bean.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -59,7 +59,7 @@
     insert) (
             sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
-            sandesha2_sequence_property_bean_t *bean);
+            sandesha2_seq_property_bean_t *bean);
 
     axis2_bool_t (AXIS2_CALL *
     remove) (
@@ -68,7 +68,7 @@
             axis2_char_t *seq_id,
             axis2_char_t *name);
 
-    sandesha2_sequence_property_bean_t *(AXIS2_CALL *
+    sandesha2_seq_property_bean_t *(AXIS2_CALL *
     retrieve) (
             sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
@@ -79,19 +79,19 @@
     update) (
             sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
-            sandesha2_sequence_property_bean_t *bean);
+            sandesha2_seq_property_bean_t *bean);
 
     axis2_array_list_t *(AXIS2_CALL *
     find) (
             sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
-            sandesha2_sequence_property_bean_t *bean);
+            sandesha2_seq_property_bean_t *bean);
 
-    sandesha2_sequence_property_bean_t *(AXIS2_CALL *
+    sandesha2_seq_property_bean_t *(AXIS2_CALL *
     find_unique) (
             sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
-            sandesha2_sequence_property_bean_t *bean);
+            sandesha2_seq_property_bean_t *bean);
 
     axis2_array_list_t *(AXIS2_CALL *
     retrieve_all) (
@@ -102,7 +102,7 @@
     update_or_insert) (
             sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
-            sandesha2_sequence_property_bean_t *bean);
+            sandesha2_seq_property_bean_t *bean);
 };
 
 struct sandesha2_seq_property_mgr

Modified: webservices/sandesha/trunk/c/include/sandesha2_sequence_report.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_sequence_report.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_sequence_report.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_sequence_report.h Tue Jul 11 05:42:25 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef SANDESHA2_SEQUENCE_REPORT_H
-#define SANDESHA2_SEQUENCE_REPORT_H
+#ifndef SANDESHA2_SEQ_REPORT_H
+#define SANDESHA2_SEQ_REPORT_H
 
 /**
- * @file sandesha2_sequence_report.h
+ * @file sandesha2_seq_report.h
  * @brief Sandesha Sequence Report Interface
  */
 
@@ -36,28 +36,28 @@
 {
 #endif
 
-typedef struct sandesha2_sequence_report sandesha2_sequence_report_t;
-typedef struct sandesha2_sequence_report_ops sandesha2_sequence_report_ops_t;
+typedef struct sandesha2_seq_report sandesha2_seq_report_t;
+typedef struct sandesha2_seq_report_ops sandesha2_seq_report_ops_t;
 
-#define SEQUENCE_STATUS_UNKNOWN 0
-#define SEQUENCE_STATUS_INITIAL 1
-#define SEQUENCE_STATUS_ESTABLISHED 2
-#define SEQUENCE_STATUS_TERMINATED 3
-#define SEQUENCE_STATUS_TIMED_OUT 4
-#define MAX_SEQUENCE_STATUS 4
-
-#define SEQUENCE_DIRECTION_UNKNOWN 0
-#define SEQUENCE_DIRECTION_IN 1
-#define SEQUENCE_DIRECTION_OUT 2
-#define MAX_SEQUENCE_DIRECTION 2
+#define SEQ_STATUS_UNKNOWN 0
+#define SEQ_STATUS_INITIAL 1
+#define SEQ_STATUS_ESTABLISHED 2
+#define SEQ_STATUS_TERMINATED 3
+#define SEQ_STATUS_TIMED_OUT 4
+#define MAX_SEQ_STATUS 4
+
+#define SEQ_DIRECTION_UNKNOWN 0
+#define SEQ_DIRECTION_IN 1
+#define SEQ_DIRECTION_OUT 2
+#define MAX_SEQ_DIRECTION 2
 
 
-/** @defgroup sandesha2_sequence_report Sequence Report
+/** @defgroup sandesha2_seq_report Sequence Report
   * @ingroup sandesha2
   * @{
   */
 
-struct sandesha2_sequence_report_ops
+struct sandesha2_seq_report_ops
 {
    /** 
      * Deallocate memory
@@ -69,130 +69,130 @@
             const axis2_env_t *env);
      
     axis2_status_t (AXIS2_CALL *
-    set_sequence_status) (
-            sandesha2_sequence_report_t *report,
+    set_seq_status) (
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env,
-            axis2_char_t sequence_status);
+            axis2_char_t seq_status);
 
     axis2_status_t (AXIS2_CALL *
-    set_sequence_direction) (
-            sandesha2_sequence_report_t *report,
+    set_seq_direction) (
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env,
-            axis2_char_t sequence_direction);
+            axis2_char_t seq_direction);
 
     axis2_char_t (AXIS2_CALL *
-    get_sequence_status) (
-            sandesha2_sequence_report_t *report,
+    get_seq_status) (
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env);
 
     axis2_char_t (AXIS2_CALL *
-    get_sequence_direction) (
-            sandesha2_sequence_report_t *report,
+    get_seq_direction) (
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env);
 
     axis2_char_t *(AXIS2_CALL *
-    get_sequence_id) (
-            sandesha2_sequence_report_t *report,
+    get_seq_id) (
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
-    set_sequence_id) (
-            sandesha2_sequence_report_t *report,
+    set_seq_id) (
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env,
-            axis2_char_t *sequence_id);
+            axis2_char_t *seq_id);
 
     axis2_array_list_t *(AXIS2_CALL *
     get_completed_msgs) (
-            sandesha2_sequence_report_t *report,
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
     add_completed_msg) (
-            sandesha2_sequence_report_t *report,
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env,
             long *msg_no);
 
     axis2_status_t (AXIS2_CALL *
     set_completed_msgs) (
-            sandesha2_sequence_report_t *report,
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env,
             axis2_array_list_t *completed_msgs);
 
     axis2_char_t *(AXIS2_CALL *
-    get_internal_sequence_id) (
-            sandesha2_sequence_report_t *report,
+    get_internal_seq_id) (
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env,
             long *msg_no);
 
     axis2_status_t (AXIS2_CALL *
-    set_internal_sequence_id) (
-            sandesha2_sequence_report_t *report,
+    set_internal_seq_id) (
+            sandesha2_seq_report_t *report,
             const axis2_env_t *env,
-            axis2_char_t *internal_sequence_id);
+            axis2_char_t *internal_seq_id);
    
 };
 
-struct sandesha2_sequence_report
+struct sandesha2_seq_report
 {
-    sandesha2_sequence_report_ops_t *ops;
+    sandesha2_seq_report_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_sequence_report_t * AXIS2_CALL
-sandesha2_sequence_report_create(const axis2_env_t *env);
+AXIS2_EXTERN sandesha2_seq_report_t * AXIS2_CALL
+sandesha2_seq_report_create(const axis2_env_t *env);
 
-#define SANDESHA2_SEQUENCE_REPORT_FREE(seq_report, env) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->free (seq_report, env))
+#define SANDESHA2_SEQ_REPORT_FREE(seq_report, env) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->free (seq_report, env))
 
-#define SANDESHA2_SEQUENCE_REPORT_SET_SEQUENCE_STATUS(seq_report, env, \
-        sequence_status) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
-      set_sequence_status (seq_report, env, sequence_status))
-
-#define SANDESHA2_SEQUENCE_REPORT_SET_SEQUENCE_DIRECTION(seq_report, env, \
-        sequence_direction) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
-      set_sequence_direction (seq_report, env, sequence_direction))
-
-#define SANDESHA2_SEQUENCE_REPORT_GET_SEQUENCE_STATUS(seq_report, env) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
-      get_sequence_status (seq_report, env))
-
-#define SANDESHA2_SEQUENCE_REPORT_GET_SEQUENCE_DIRECTION(seq_report, env) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
-      get_sequence_direction (seq_report, env))
-
-#define SANDESHA2_SEQUENCE_REPORT_GET_SEQUENCE_ID(seq_report, env) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
-      get_sequence_id (seq_report, env))
-
-#define SANDESHA2_SEQUENCE_REPORT_SET_SEQUENCE_ID(seq_report, env, sequence_id) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
-      set_sequence_id (seq_report, env, sequence_id))
+#define SANDESHA2_SEQ_REPORT_SET_SEQ_STATUS(seq_report, env, \
+        seq_status) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
+      set_seq_status (seq_report, env, seq_status))
+
+#define SANDESHA2_SEQ_REPORT_SET_SEQ_DIRECTION(seq_report, env, \
+        seq_direction) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
+      set_seq_direction (seq_report, env, seq_direction))
+
+#define SANDESHA2_SEQ_REPORT_GET_SEQ_STATUS(seq_report, env) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
+      get_seq_status (seq_report, env))
+
+#define SANDESHA2_SEQ_REPORT_GET_SEQ_DIRECTION(seq_report, env) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
+      get_seq_direction (seq_report, env))
+
+#define SANDESHA2_SEQ_REPORT_GET_SEQ_ID(seq_report, env) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
+      get_seq_id (seq_report, env))
+
+#define SANDESHA2_SEQ_REPORT_SET_SEQ_ID(seq_report, env, seq_id) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
+      set_seq_id (seq_report, env, seq_id))
 
-#define SANDESHA2_SEQUENCE_REPORT_GET_COMPLETED_MSGS(seq_report, env) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
+#define SANDESHA2_SEQ_REPORT_GET_COMPLETED_MSGS(seq_report, env) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
       get_completed_msgs (seq_report, env))
 
-#define SANDESHA2_SEQUENCE_REPORT_ADD_COMPLETED_MSG(seq_report, env, msg_no) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
+#define SANDESHA2_SEQ_REPORT_ADD_COMPLETED_MSG(seq_report, env, msg_no) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
       add_completed_msg (seq_report, env, msg_no))
 
-#define SANDESHA2_SEQUENCE_REPORT_SET_COMPLETED_MSGS(seq_report, env, completed_msgs) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
+#define SANDESHA2_SEQ_REPORT_SET_COMPLETED_MSGS(seq_report, env, completed_msgs) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
       set_completed_msgs (seq_report, env, completed_msgs))
 
-#define SANDESHA2_SEQUENCE_REPORT_GET_INTERNAL_SEQUENCE_ID(seq_report, env) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
-      get_internal_sequence_id (seq_report, env))
-
-#define SANDESHA2_SEQUENCE_REPORT_SET_INTERNAL_SEQUENCE_ID(seq_report, env, \
-        sequence_id) \
-      (((sandesha2_sequence_report_t *) seq_report)->ops->\
-      set_internal_sequence_id (seq_report, env, sequence_id))
+#define SANDESHA2_SEQ_REPORT_GET_INTERNAL_SEQ_ID(seq_report, env) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
+      get_internal_seq_id (seq_report, env))
+
+#define SANDESHA2_SEQ_REPORT_SET_INTERNAL_SEQ_ID(seq_report, env, \
+        seq_id) \
+      (((sandesha2_seq_report_t *) seq_report)->ops->\
+      set_internal_seq_id (seq_report, env, seq_id))
 
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* SANDESHA2_SEQUENCE_REPORT_H */
+#endif /* SANDESHA2_SEQ_REPORT_H */

Modified: webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h Tue Jul 11 05:42:25 2006
@@ -28,11 +28,11 @@
 #include <axis2_conf_ctx.h>
 #include <axis2_module_desc.h>
 #include <sandesha2_transaction.h>
-#include <sandesha2_create_seq_bean_mgr.h>
-#include <sandesha2_next_msg_bean_mgr.h>
-#include <sandesha2_sender_bean_mgr.h>
-#include <sandesha2_seq_property_bean_mgr.h>
-#include <sandesha2_invoker_bean_mgr.h>
+#include <sandesha2_create_seq_mgr.h>
+#include <sandesha2_next_msg_mgr.h>
+#include <sandesha2_sender_mgr.h>
+#include <sandesha2_seq_property_mgr.h>
+#include <sandesha2_invoker_mgr.h>
 
 
 #ifdef __cplusplus
@@ -76,28 +76,28 @@
             (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
             
-    sandesha2_create_seq_bean_mgr_t* (AXIS2_CALL *
-        get_create_seq_bean_mgr) 
+    sandesha2_create_seq_mgr_t* (AXIS2_CALL *
+        get_create_seq_mgr) 
             (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
     
-    sandesha2_next_msg_bean_mgr_t* (AXIS2_CALL *
-        get_next_msg_bean_mgr) 
+    sandesha2_next_msg_mgr_t* (AXIS2_CALL *
+        get_next_msg_mgr) 
             (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
 
-    sandesha2_sender_bean_mgr_t* (AXIS2_CALL *
-        get_retrans_bean_mgr) 
+    sandesha2_sender_mgr_t* (AXIS2_CALL *
+        get_retrans_mgr) 
             (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
     
-    sandesha2_seq_property_bean_mgr_t* (AXIS2_CALL *
-        get_seq_property_bean_mgr) 
+    sandesha2_seq_property_mgr_t* (AXIS2_CALL *
+        get_seq_property_mgr) 
             (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
 
-    sandesha2_invoker_bean_mgr_t* (AXIS2_CALL *
-        get_storage_map_bean_mgr) 
+    sandesha2_invoker_mgr_t* (AXIS2_CALL *
+        get_storage_map_mgr) 
             (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
             
@@ -165,19 +165,19 @@
     ((storage_man)->ops->get_transaction(storage_man, env))
     
 #define SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_BEAN_MGR(storage_man, env)\
-    ((storage_man)->ops->get_create_seq_bean_mgr(storage_man, env))
+    ((storage_man)->ops->get_create_seq_mgr(storage_man, env))
     
 #define SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_BEAN_MGR(storage_man, env)\
-    ((storage_man)->ops->get_next_msg_bean_mgr(storage_man, env))
+    ((storage_man)->ops->get_next_msg_mgr(storage_man, env))
     
 #define SANDESHA2_STORAGE_MGR_GET_RETRANS_BEAN_MGR(storage_man, env)\
-    ((storage_man)->ops->get_retrans_bean_mgr(storage_man, env))
+    ((storage_man)->ops->get_retrans_mgr(storage_man, env))
 
 #define SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(storage_man, env)\
-    ((storage_man)->ops->get_seq_property_bean_mgr(storage_man, env))
+    ((storage_man)->ops->get_seq_property_mgr(storage_man, env))
     
 #define SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_BEAN_MGR(storage_man, env)\
-    ((storage_man)->ops->get_storage_map_bean_mgr(storage_man, env))
+    ((storage_man)->ops->get_storage_map_mgr(storage_man, env))
     
 #define SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, storage_key, \
     msg_ctx) \

Modified: webservices/sandesha/trunk/c/include/sandesha2_transaction.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_transaction.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_transaction.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_transaction.h Tue Jul 11 05:42:25 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef SANDESHA2_IN_MEMORY_TRANSACTION_H
-#define SANDESHA2_IN_MEMORY_TRANSACTION_H
+#ifndef SANDESHA2_TRANSACTION_H
+#define SANDESHA2_TRANSACTION_H
 
 /**
- * @file sandesha2_in_memory_transaction.h
+ * @file sandesha2_transaction.h
  * @brief Sandesha In Memory Transaction  Interface
  */
 
@@ -33,15 +33,15 @@
 {
 #endif
 
-typedef struct sandesha2_in_memory_transaction sandesha2_in_memory_transaction_t;
-typedef struct sandesha2_in_memory_transaction_ops sandesha2_in_memory_transaction_ops_t;
+typedef struct sandesha2_transaction sandesha2_transaction_t;
+typedef struct sandesha2_transaction_ops sandesha2_transaction_ops_t;
 
-/** @defgroup sandesha2_in_memory_transaction In Memory Transaction 
+/** @defgroup sandesha2_transaction In Memory Transaction 
   * @ingroup sandesha2
   * @{
   */
 
-struct sandesha2_in_memory_transaction_ops
+struct sandesha2_transaction_ops
 {
    /** 
      * Deallocate memory
@@ -54,37 +54,37 @@
      
     axis2_status_t (AXIS2_CALL *
     commit) (
-            sandesha2_in_memory_transaction_t *seq_mgr,
+            sandesha2_transaction_t *seq_mgr,
             const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
     rollback) (
-            sandesha2_in_memory_transaction_t *seq_mgr,
+            sandesha2_transaction_t *seq_mgr,
             const axis2_env_t *env);
 };
 
-struct sandesha2_in_memory_transaction
+struct sandesha2_transaction
 {
-    sandesha2_in_memory_transaction_ops_t *ops;
+    sandesha2_transaction_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_in_memory_transaction_t * AXIS2_CALL
-sandesha2_in_memory_transaction_create(
+AXIS2_EXTERN sandesha2_transaction_t * AXIS2_CALL
+sandesha2_transaction_create(
         const axis2_env_t *env);
 
-#define SANDESHA2_IN_MEMORY_TRANSACTION_FREE(seq_mgr, env) \
-      (((sandesha2_in_memory_transaction_t *) seq_mgr)->ops->free (seq_mgr, env))
+#define SANDESHA2_TRANSACTION_FREE(seq_mgr, env) \
+      (((sandesha2_transaction_t *) seq_mgr)->ops->free (seq_mgr, env))
 
-#define SANDESHA2_IN_MEMORY_TRANSACTION_COMMIT(seq_mgr, env) \
-      (((sandesha2_in_memory_transaction_t *) seq_mgr)->ops->\
+#define SANDESHA2_TRANSACTION_COMMIT(seq_mgr, env) \
+      (((sandesha2_transaction_t *) seq_mgr)->ops->\
        commit (seq_mgr, env))
 
-#define SANDESHA2_IN_MEMORY_TRANSACTION_ROLLBACK(seq_mgr, env) \
-      (((sandesha2_in_memory_transaction_t *) seq_mgr)->ops->\
+#define SANDESHA2_TRANSACTION_ROLLBACK(seq_mgr, env) \
+      (((sandesha2_transaction_t *) seq_mgr)->ops->\
        rollback (seq_mgr, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* SANDESHA2_IN_MEMORY_TRANSACTION_H */
+#endif /* SANDESHA2_TRANSACTION_H */

Modified: webservices/sandesha/trunk/c/src/client/sandesha2_client_constatns.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/sandesha2_client_constatns.h?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/client/sandesha2_client_constatns.h (original)
+++ webservices/sandesha/trunk/c/src/client/sandesha2_client_constatns.h Tue Jul 11 05:42:25 2006
@@ -36,9 +36,9 @@
 /*********************************** Constansts********************************/
 #define SANDESHA2_CLIENT_ACKS_TO "Sandesha2AcksTo"
 #define SANDESHA2_CLIENT_LAST_MESSAGE "Sandesha2LastMessage"
-#define SANDESHA2_CLIENT_OFFERED_SEQUENCE_ID "Sandesha2OfferedSequenceId"
+#define SANDESHA2_CLIENT_OFFERED_SEQ_ID "Sandesha2OfferedSequenceId"
 #define SANDESHA2_CLIENT_DEBUG_MODE "Sandesha2DebugMode"
-#define SANDESHA2_CLIENT_SEQUENCE_KEY "Sandesha2SequenceKey"
+#define SANDESHA2_CLIENT_SEQ_KEY "Sandesha2SequenceKey"
 #define SANDESHA2_CLIENT_MESSAGE_NUMBER "Sandesha2MessageNumber"
 #define SANDESHA2_CLIENT_RM_SPEC_VERSION "Sandesha2RMSpecVersion"
 #define SANDESHA2_CLIENT_DUMMY_MESSAGE "Sandesha2DummyMessage" /* If this 



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org