Fix svn properties where needed:

          Remove svn:executable
          Add svn:executable
          Add svn:eol-style
          Add svn:keywords


svn path=/trunk/; revision=15184

4 files changed, 769 insertions, 769 deletions

diff --git a/idl/parlay/termcap.idl b/idl/parlay/termcap.idl
index c8c8395c7c..b0f03356e2 100644
--- a/idl/parlay/termcap.idl
+++ b/idl/parlay/termcap.idl
@@ -1,113 +1,113 @@
-//Source file: termcap.idl

-//Date:  11 October 2004

-//Terminal Capability Interfaces and Data Types for ETSI ES 203 915-07 V1.1.1, DES/TISPAN-01005-07-OSA, Parlay 5.0

-

-#ifndef __TERMCAP_DEFINED

-#define __TERMCAP_DEFINED

-

-

-#include "osa.idl"

-

-module org {

-	

-	module csapi {

-		

-		

-		module termcap {

-			

-			

-			struct TpTerminalCapabilities {

-				TpString TerminalCapabilities;

-				TpBoolean StatusCode;

-			};

-			

-			

-			enum TpTerminalCapabilitiesError {

-

-				P_TERMCAP_ERROR_UNDEFINED,

-				P_TERMCAP_INVALID_TERMINALID,

-				P_TERMCAP_SYSTEM_FAILURE,

-				P_TERMCAP_INFO_UNAVAILABLE				

-			};

-			

-			

-			exception P_INVALID_TERMINAL_ID {

-				TpString ExtraInformation;

-			};

-			

-			

-			typedef TpInt32 TpTerminalCapabilityChangeCriteria;

-			

-			

-			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_UNDEFINED = 0;

-			

-			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_GENERAL = 1;

-			

-			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_HW_UPDATE = 2;

-			

-			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_SW_UPDATE = 4;

-			

-			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_INITIAL = 8;

-			

-			enum TpTerminalCapabilityScopeType {

-

-				P_TERMINAL_CAPABILITY_SCOPE_TYPE_UNDEFINED,

-				P_TERMINAL_CAPABILITY_SCOPE_TYPE_CCPP				

-			};

-			

-			

-			struct TpTerminalCapabilityScope {

-				TpTerminalCapabilityScopeType ScopeType;

-				TpString Scope;

-			};

-			

-			

-			interface IpTerminalCapabilities : IpService {

-				TpTerminalCapabilities getTerminalCapabilities (

-					in TpString terminalIdentity	

-					)					

-					raises (TpCommonExceptions,P_INVALID_TERMINAL_ID);

-					

-			};

-			

-			

-			interface IpAppExtendedTerminalCapabilities : IpInterface {

-				void triggeredTerminalCapabilityReport (

-					in TpAssignmentID assignmentID,	

-					in TpAddressSet terminals,	

-					in TpTerminalCapabilityChangeCriteria criteria,	

-					in TpTerminalCapabilities capabilities	

-					);

-					

-				void triggeredTerminalCapabilityReportErr (

-					in TpAssignmentID assignmentId,	

-					in TpAddressSet terminals,	

-					in TpTerminalCapabilitiesError cause	

-					);

-					

-			};

-			

-			

-			interface IpExtendedTerminalCapabilities : IpTerminalCapabilities {

-				TpAssignmentID triggeredTerminalCapabilityStartReq (

-					in IpAppExtendedTerminalCapabilities appTerminalCapabilities,	

-					in TpAddressSet terminals,	

-					in TpTerminalCapabilityScope capabilityScope,	

-					in TpTerminalCapabilityChangeCriteria criteria	

-					)					

-					raises (TpCommonExceptions,P_INFORMATION_NOT_AVAILABLE,P_INVALID_INTERFACE_TYPE,P_INVALID_CRITERIA,P_INVALID_TERMINAL_ID);

-					

-				void triggeredTerminalCapabilityStop (

-					in TpAssignmentID assignmentID	

-					)					

-					raises (TpCommonExceptions,P_INVALID_ASSIGNMENT_ID);

-					

-			};

-			

-		};

-		

-	};

-	

-};

-

-#endif

+//Source file: termcap.idl
+//Date:  11 October 2004
+//Terminal Capability Interfaces and Data Types for ETSI ES 203 915-07 V1.1.1, DES/TISPAN-01005-07-OSA, Parlay 5.0
+
+#ifndef __TERMCAP_DEFINED
+#define __TERMCAP_DEFINED
+
+
+#include "osa.idl"
+
+module org {
+	
+	module csapi {
+		
+		
+		module termcap {
+			
+			
+			struct TpTerminalCapabilities {
+				TpString TerminalCapabilities;
+				TpBoolean StatusCode;
+			};
+			
+			
+			enum TpTerminalCapabilitiesError {
+
+				P_TERMCAP_ERROR_UNDEFINED,
+				P_TERMCAP_INVALID_TERMINALID,
+				P_TERMCAP_SYSTEM_FAILURE,
+				P_TERMCAP_INFO_UNAVAILABLE				
+			};
+			
+			
+			exception P_INVALID_TERMINAL_ID {
+				TpString ExtraInformation;
+			};
+			
+			
+			typedef TpInt32 TpTerminalCapabilityChangeCriteria;
+			
+			
+			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_UNDEFINED = 0;
+			
+			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_GENERAL = 1;
+			
+			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_HW_UPDATE = 2;
+			
+			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_SW_UPDATE = 4;
+			
+			const TpTerminalCapabilityChangeCriteria P_TERMINAL_CAPABILITY_CHANGE_CRITERIA_INITIAL = 8;
+			
+			enum TpTerminalCapabilityScopeType {
+
+				P_TERMINAL_CAPABILITY_SCOPE_TYPE_UNDEFINED,
+				P_TERMINAL_CAPABILITY_SCOPE_TYPE_CCPP				
+			};
+			
+			
+			struct TpTerminalCapabilityScope {
+				TpTerminalCapabilityScopeType ScopeType;
+				TpString Scope;
+			};
+			
+			
+			interface IpTerminalCapabilities : IpService {
+				TpTerminalCapabilities getTerminalCapabilities (
+					in TpString terminalIdentity	
+					)					
+					raises (TpCommonExceptions,P_INVALID_TERMINAL_ID);
+					
+			};
+			
+			
+			interface IpAppExtendedTerminalCapabilities : IpInterface {
+				void triggeredTerminalCapabilityReport (
+					in TpAssignmentID assignmentID,	
+					in TpAddressSet terminals,	
+					in TpTerminalCapabilityChangeCriteria criteria,	
+					in TpTerminalCapabilities capabilities	
+					);
+					
+				void triggeredTerminalCapabilityReportErr (
+					in TpAssignmentID assignmentId,	
+					in TpAddressSet terminals,	
+					in TpTerminalCapabilitiesError cause	
+					);
+					
+			};
+			
+			
+			interface IpExtendedTerminalCapabilities : IpTerminalCapabilities {
+				TpAssignmentID triggeredTerminalCapabilityStartReq (
+					in IpAppExtendedTerminalCapabilities appTerminalCapabilities,	
+					in TpAddressSet terminals,	
+					in TpTerminalCapabilityScope capabilityScope,	
+					in TpTerminalCapabilityChangeCriteria criteria	
+					)					
+					raises (TpCommonExceptions,P_INFORMATION_NOT_AVAILABLE,P_INVALID_INTERFACE_TYPE,P_INVALID_CRITERIA,P_INVALID_TERMINAL_ID);
+					
+				void triggeredTerminalCapabilityStop (
+					in TpAssignmentID assignmentID	
+					)					
+					raises (TpCommonExceptions,P_INVALID_ASSIGNMENT_ID);
+					
+			};
+			
+		};
+		
+	};
+	
+};
+
+#endif
diff --git a/idl/parlay/ui_data.idl b/idl/parlay/ui_data.idl
index 60f461b10a..14f2548df8 100644
--- a/idl/parlay/ui_data.idl
+++ b/idl/parlay/ui_data.idl
@@ -1,295 +1,295 @@
-//Source file: ui_data.idl

-//Date:  8 October 2004

-//User Interaction Data Types for ETSI ES 203 915-05 V1.1.1, DES/TISPAN-01005-05-OSA, Parlay 5.0

-

-#ifndef __UI_DATA_DEFINED

-#define __UI_DATA_DEFINED

-

-

-#include "osa.idl"

-

-module org {

-	

-	module csapi {

-		

-		

-		module ui {

-			

-			

-			enum TpUIVariablePartType {

-

-				P_UI_VARIABLE_PART_INT,

-				P_UI_VARIABLE_PART_ADDRESS,

-				P_UI_VARIABLE_PART_TIME,

-				P_UI_VARIABLE_PART_DATE,

-				P_UI_VARIABLE_PART_PRICE				

-			};

-			

-			

-			union TpUIVariableInfo switch(TpUIVariablePartType) {

-				case P_UI_VARIABLE_PART_INT: TpInt32 VariablePartInteger;

-				case P_UI_VARIABLE_PART_ADDRESS: TpString VariablePartAddress;

-				case P_UI_VARIABLE_PART_TIME: TpTime VariablePartTime;

-				case P_UI_VARIABLE_PART_DATE: TpDate VariablePartDate;

-				case P_UI_VARIABLE_PART_PRICE: TpPrice VariablePartPrice;

-			};

-			

-			

-			typedef sequence <TpUIVariableInfo> TpUIVariableInfoSet;

-			

-			

-			typedef TpInt32 TpUIResponseRequest;

-			

-			

-			enum TpUIReport {

-

-				P_UI_REPORT_UNDEFINED,

-				P_UI_REPORT_INFO_SENT,

-				P_UI_REPORT_INFO_COLLECTED,

-				P_UI_REPORT_NO_INPUT,

-				P_UI_REPORT_TIMEOUT,

-				P_UI_REPORT_MESSAGE_STORED,

-				P_UI_REPORT_MESSAGE_NOT_STORED,

-				P_UI_REPORT_MESSAGE_DELETED,

-				P_UI_REPORT_MESSAGE_NOT_DELETED				

-			};

-			

-			

-			struct TpUIMessageCriteria {

-				TpString EndSequence;

-				TpDuration MaxMessageTime;

-				TpInt32 MaxMessageSize;

-			};

-			

-			

-			enum TpUIInfoType {

-

-				P_UI_INFO_ID,

-				P_UI_INFO_DATA,

-				P_UI_INFO_ADDRESS,

-				P_UI_INFO_BIN_DATA,

-				P_UI_INFO_UUENCODED,

-				P_UI_INFO_MIME,

-				P_UI_INFO_WAVE,

-				P_UI_INFO_AU,

-				P_UI_INFO_VXML,

-				P_UI_INFO_SYNTHESIS				

-			};

-			

-			

-			enum TpUIFault {

-

-				P_UI_FAULT_UNDEFINED,

-				P_UI_CALL_ENDED				

-			};

-			

-			

-			enum TpUIEventInfoDataType {

-

-				P_UI_EVENT_DATA_TYPE_UNDEFINED,

-				P_UI_EVENT_DATA_TYPE_UNSPECIFIED,

-				P_UI_EVENT_DATA_TYPE_TEXT,

-				P_UI_EVENT_DATA_TYPE_USSD_DATA				

-			};

-			

-			

-			struct TpUIEventInfo {

-				TpAddress OriginatingAddress;

-				TpAddress DestinationAddress;

-				TpString ServiceCode;

-				TpUIEventInfoDataType DataTypeIndication;

-				TpString DataString;

-			};

-			

-			

-			struct TpUIEventCriteria {

-				TpAddressRange OriginatingAddress;

-				TpAddressRange DestinationAddress;

-				TpString ServiceCode;

-			};

-			

-			

-			enum TpUIError {

-

-				P_UI_ERROR_UNDEFINED,

-				P_UI_ERROR_ILLEGAL_INFO,

-				P_UI_ERROR_ID_NOT_FOUND,

-				P_UI_ERROR_RESOURCE_UNAVAILABLE,

-				P_UI_ERROR_ILLEGAL_RANGE,

-				P_UI_ERROR_IMPROPER_USER_RESPONSE,

-				P_UI_ERROR_ABANDON,

-				P_UI_ERROR_NO_OPERATION_ACTIVE,

-				P_UI_ERROR_NO_SPACE_AVAILABLE,

-				P_UI_ERROR_RESOURCE_TIMEOUT				

-			};

-			

-			

-			const TpInt32 P_UI_RESPONSE_REQUIRED = 1;

-			

-			const TpInt32 P_UI_LAST_ANNOUNCEMENT_IN_A_ROW = 2;

-			

-			const TpInt32 P_UI_FINAL_REQUEST = 4;

-			

-			struct TpUIEventCriteriaResult {

-				TpUIEventCriteria EventCriteria;

-				TpInt32 AssignmentID;

-			};

-			

-			

-			typedef sequence <TpUIEventCriteriaResult> TpUIEventCriteriaResultSet;

-			

-			

-			exception P_ID_NOT_FOUND {

-				TpString ExtraInformation;

-			};

-			

-			

-			exception P_ILLEGAL_ID {

-				TpString ExtraInformation;

-			};

-			

-			

-			exception P_ILLEGAL_RANGE {

-				TpString ExtraInformation;

-			};

-			

-			

-			exception P_INVALID_COLLECTION_CRITERIA {

-				TpString ExtraInformation;

-			};

-			

-			

-			struct TpUIEventNotificationInfo {

-				TpAddress OriginatingAddress;

-				TpAddress DestinationAddress;

-				TpString ServiceCode;

-				TpUIEventInfoDataType DataTypeIndication;

-				TpOctetSet UIEventData;

-			};

-			

-			

-			typedef TpString TpUIRecognitionGrammar;

-			

-			

-			struct TpUIRecognitionProperty {

-				TpString PropertyName;

-				TpString PropertyValue;

-			};

-			

-			

-			typedef sequence <TpUIRecognitionProperty> TpUIRecognitionPropertySet;

-			

-			

-			typedef TpString TpUIRecognitionSpeakerID;

-			

-			

-			struct TpUIRecognitionCriteria {

-				TpUIRecognitionSpeakerID SpeakerID;

-				TpUIRecognitionPropertySet Properties;

-				TpUIRecognitionGrammar Grammar;

-			};

-			

-			

-			enum TpUICollectMode {

-

-				P_UI_COLLECT_MODE_DTMF,

-				P_UI_COLLECT_MODE_VOICE,

-				P_UI_COLLECT_MODE_DTMFANDVOICE				

-			};

-			

-			

-			struct TpUICollectCriteria {

-				TpInt32 MinLength;

-				TpInt32 MaxLength;

-				TpString EndSequence;

-				TpDuration StartTimeout;

-				TpDuration InterCharTimeout;

-				TpUICollectMode CollectMode;

-				TpUIRecognitionCriteria RecognitionCriteria;

-			};

-			

-			

-			enum TpUIPronounceType {

-

-				P_UI_PRONOUNCE_IPA,

-				P_UI_PRONOUNCE_SOUNDSLIKE				

-			};

-			

-			

-			struct TpUIWordOverride {

-				TpString Spelling;

-				TpUIPronounceType PronounceType;

-				TpString PronounceAs;

-			};

-			

-			

-			typedef sequence <TpUIWordOverride> TpUIWordOverrideSet;

-			

-			

-			enum TpUISynthesisRange {

-

-				P_UI_RANGE_CALMER,

-				P_UI_RANGE_CALM,

-				P_UI_RANGE_AVERAGE,

-				P_UI_RANGE_EXCITED,

-				P_UI_RANGE_MORE_EXCITED				

-			};

-			

-			

-			enum TpUISynthesisRate {

-

-				P_UI_RATE_SLOW,

-				P_UI_RATE_AVERAGE,

-				P_UI_RATE_FAST				

-			};

-			

-			

-			enum TpUISynthesisAge {

-

-				P_UI_AGE_CHILD,

-				P_UI_AGE_YOUNG_ADULT,

-				P_UI_AGE_ADULT,

-				P_UI_AGE_OLDER_ADULT				

-			};

-			

-			

-			enum TpUISynthesisGender {

-

-				P_UI_GENDER_MALE,

-				P_UI_GENDER_FEMALE				

-			};

-			

-			

-			struct TpUISynthesisInfoData {

-				TpUISynthesisGender SpeakerGender;

-				TpUISynthesisAge SpeakerAge;

-				TpUISynthesisRate SpeakerRate;

-				TpUISynthesisRange SpeakerRange;

-				TpString TextData;

-				TpUIWordOverrideSet WordOverrideSet;

-			};

-			

-			

-			union TpUIInfo switch(TpUIInfoType) {

-				case P_UI_INFO_ID: TpInt32 InfoID;	

-				case P_UI_INFO_DATA: TpString InfoData;	

-				case P_UI_INFO_ADDRESS: TpURL InfoAddress;	

-				case P_UI_INFO_BIN_DATA: TpOctetSet InfoBinData;	

-				case P_UI_INFO_UUENCODED: TpString InfoUUEncData;	

-				case P_UI_INFO_MIME: TpOctetSet InfoMimeData;	

-				case P_UI_INFO_WAVE: TpOctetSet InfoWaveData;	

-				case P_UI_INFO_AU: TpOctetSet InfoAuData;	

-				case P_UI_INFO_VXML: TpString InfoVXMLData;	

-				case P_UI_INFO_SYNTHESIS: TpUISynthesisInfoData InfoSynthData;	

-			};

-			

-			

-			typedef sequence <TpInt32> TpMessageIDList;

-			

-		};

-		

-	};

-	

-};

-

-#endif

+//Source file: ui_data.idl
+//Date:  8 October 2004
+//User Interaction Data Types for ETSI ES 203 915-05 V1.1.1, DES/TISPAN-01005-05-OSA, Parlay 5.0
+
+#ifndef __UI_DATA_DEFINED
+#define __UI_DATA_DEFINED
+
+
+#include "osa.idl"
+
+module org {
+	
+	module csapi {
+		
+		
+		module ui {
+			
+			
+			enum TpUIVariablePartType {
+
+				P_UI_VARIABLE_PART_INT,
+				P_UI_VARIABLE_PART_ADDRESS,
+				P_UI_VARIABLE_PART_TIME,
+				P_UI_VARIABLE_PART_DATE,
+				P_UI_VARIABLE_PART_PRICE				
+			};
+			
+			
+			union TpUIVariableInfo switch(TpUIVariablePartType) {
+				case P_UI_VARIABLE_PART_INT: TpInt32 VariablePartInteger;
+				case P_UI_VARIABLE_PART_ADDRESS: TpString VariablePartAddress;
+				case P_UI_VARIABLE_PART_TIME: TpTime VariablePartTime;
+				case P_UI_VARIABLE_PART_DATE: TpDate VariablePartDate;
+				case P_UI_VARIABLE_PART_PRICE: TpPrice VariablePartPrice;
+			};
+			
+			
+			typedef sequence <TpUIVariableInfo> TpUIVariableInfoSet;
+			
+			
+			typedef TpInt32 TpUIResponseRequest;
+			
+			
+			enum TpUIReport {
+
+				P_UI_REPORT_UNDEFINED,
+				P_UI_REPORT_INFO_SENT,
+				P_UI_REPORT_INFO_COLLECTED,
+				P_UI_REPORT_NO_INPUT,
+				P_UI_REPORT_TIMEOUT,
+				P_UI_REPORT_MESSAGE_STORED,
+				P_UI_REPORT_MESSAGE_NOT_STORED,
+				P_UI_REPORT_MESSAGE_DELETED,
+				P_UI_REPORT_MESSAGE_NOT_DELETED				
+			};
+			
+			
+			struct TpUIMessageCriteria {
+				TpString EndSequence;
+				TpDuration MaxMessageTime;
+				TpInt32 MaxMessageSize;
+			};
+			
+			
+			enum TpUIInfoType {
+
+				P_UI_INFO_ID,
+				P_UI_INFO_DATA,
+				P_UI_INFO_ADDRESS,
+				P_UI_INFO_BIN_DATA,
+				P_UI_INFO_UUENCODED,
+				P_UI_INFO_MIME,
+				P_UI_INFO_WAVE,
+				P_UI_INFO_AU,
+				P_UI_INFO_VXML,
+				P_UI_INFO_SYNTHESIS				
+			};
+			
+			
+			enum TpUIFault {
+
+				P_UI_FAULT_UNDEFINED,
+				P_UI_CALL_ENDED				
+			};
+			
+			
+			enum TpUIEventInfoDataType {
+
+				P_UI_EVENT_DATA_TYPE_UNDEFINED,
+				P_UI_EVENT_DATA_TYPE_UNSPECIFIED,
+				P_UI_EVENT_DATA_TYPE_TEXT,
+				P_UI_EVENT_DATA_TYPE_USSD_DATA				
+			};
+			
+			
+			struct TpUIEventInfo {
+				TpAddress OriginatingAddress;
+				TpAddress DestinationAddress;
+				TpString ServiceCode;
+				TpUIEventInfoDataType DataTypeIndication;
+				TpString DataString;
+			};
+			
+			
+			struct TpUIEventCriteria {
+				TpAddressRange OriginatingAddress;
+				TpAddressRange DestinationAddress;
+				TpString ServiceCode;
+			};
+			
+			
+			enum TpUIError {
+
+				P_UI_ERROR_UNDEFINED,
+				P_UI_ERROR_ILLEGAL_INFO,
+				P_UI_ERROR_ID_NOT_FOUND,
+				P_UI_ERROR_RESOURCE_UNAVAILABLE,
+				P_UI_ERROR_ILLEGAL_RANGE,
+				P_UI_ERROR_IMPROPER_USER_RESPONSE,
+				P_UI_ERROR_ABANDON,
+				P_UI_ERROR_NO_OPERATION_ACTIVE,
+				P_UI_ERROR_NO_SPACE_AVAILABLE,
+				P_UI_ERROR_RESOURCE_TIMEOUT				
+			};
+			
+			
+			const TpInt32 P_UI_RESPONSE_REQUIRED = 1;
+			
+			const TpInt32 P_UI_LAST_ANNOUNCEMENT_IN_A_ROW = 2;
+			
+			const TpInt32 P_UI_FINAL_REQUEST = 4;
+			
+			struct TpUIEventCriteriaResult {
+				TpUIEventCriteria EventCriteria;
+				TpInt32 AssignmentID;
+			};
+			
+			
+			typedef sequence <TpUIEventCriteriaResult> TpUIEventCriteriaResultSet;
+			
+			
+			exception P_ID_NOT_FOUND {
+				TpString ExtraInformation;
+			};
+			
+			
+			exception P_ILLEGAL_ID {
+				TpString ExtraInformation;
+			};
+			
+			
+			exception P_ILLEGAL_RANGE {
+				TpString ExtraInformation;
+			};
+			
+			
+			exception P_INVALID_COLLECTION_CRITERIA {
+				TpString ExtraInformation;
+			};
+			
+			
+			struct TpUIEventNotificationInfo {
+				TpAddress OriginatingAddress;
+				TpAddress DestinationAddress;
+				TpString ServiceCode;
+				TpUIEventInfoDataType DataTypeIndication;
+				TpOctetSet UIEventData;
+			};
+			
+			
+			typedef TpString TpUIRecognitionGrammar;
+			
+			
+			struct TpUIRecognitionProperty {
+				TpString PropertyName;
+				TpString PropertyValue;
+			};
+			
+			
+			typedef sequence <TpUIRecognitionProperty> TpUIRecognitionPropertySet;
+			
+			
+			typedef TpString TpUIRecognitionSpeakerID;
+			
+			
+			struct TpUIRecognitionCriteria {
+				TpUIRecognitionSpeakerID SpeakerID;
+				TpUIRecognitionPropertySet Properties;
+				TpUIRecognitionGrammar Grammar;
+			};
+			
+			
+			enum TpUICollectMode {
+
+				P_UI_COLLECT_MODE_DTMF,
+				P_UI_COLLECT_MODE_VOICE,
+				P_UI_COLLECT_MODE_DTMFANDVOICE				
+			};
+			
+			
+			struct TpUICollectCriteria {
+				TpInt32 MinLength;
+				TpInt32 MaxLength;
+				TpString EndSequence;
+				TpDuration StartTimeout;
+				TpDuration InterCharTimeout;
+				TpUICollectMode CollectMode;
+				TpUIRecognitionCriteria RecognitionCriteria;
+			};
+			
+			
+			enum TpUIPronounceType {
+
+				P_UI_PRONOUNCE_IPA,
+				P_UI_PRONOUNCE_SOUNDSLIKE				
+			};
+			
+			
+			struct TpUIWordOverride {
+				TpString Spelling;
+				TpUIPronounceType PronounceType;
+				TpString PronounceAs;
+			};
+			
+			
+			typedef sequence <TpUIWordOverride> TpUIWordOverrideSet;
+			
+			
+			enum TpUISynthesisRange {
+
+				P_UI_RANGE_CALMER,
+				P_UI_RANGE_CALM,
+				P_UI_RANGE_AVERAGE,
+				P_UI_RANGE_EXCITED,
+				P_UI_RANGE_MORE_EXCITED				
+			};
+			
+			
+			enum TpUISynthesisRate {
+
+				P_UI_RATE_SLOW,
+				P_UI_RATE_AVERAGE,
+				P_UI_RATE_FAST				
+			};
+			
+			
+			enum TpUISynthesisAge {
+
+				P_UI_AGE_CHILD,
+				P_UI_AGE_YOUNG_ADULT,
+				P_UI_AGE_ADULT,
+				P_UI_AGE_OLDER_ADULT				
+			};
+			
+			
+			enum TpUISynthesisGender {
+
+				P_UI_GENDER_MALE,
+				P_UI_GENDER_FEMALE				
+			};
+			
+			
+			struct TpUISynthesisInfoData {
+				TpUISynthesisGender SpeakerGender;
+				TpUISynthesisAge SpeakerAge;
+				TpUISynthesisRate SpeakerRate;
+				TpUISynthesisRange SpeakerRange;
+				TpString TextData;
+				TpUIWordOverrideSet WordOverrideSet;
+			};
+			
+			
+			union TpUIInfo switch(TpUIInfoType) {
+				case P_UI_INFO_ID: TpInt32 InfoID;	
+				case P_UI_INFO_DATA: TpString InfoData;	
+				case P_UI_INFO_ADDRESS: TpURL InfoAddress;	
+				case P_UI_INFO_BIN_DATA: TpOctetSet InfoBinData;	
+				case P_UI_INFO_UUENCODED: TpString InfoUUEncData;	
+				case P_UI_INFO_MIME: TpOctetSet InfoMimeData;	
+				case P_UI_INFO_WAVE: TpOctetSet InfoWaveData;	
+				case P_UI_INFO_AU: TpOctetSet InfoAuData;	
+				case P_UI_INFO_VXML: TpString InfoVXMLData;	
+				case P_UI_INFO_SYNTHESIS: TpUISynthesisInfoData InfoSynthData;	
+			};
+			
+			
+			typedef sequence <TpInt32> TpMessageIDList;
+			
+		};
+		
+	};
+	
+};
+
+#endif
diff --git a/idl/parlay/ui_interfaces.idl b/idl/parlay/ui_interfaces.idl
index 21386e9240..c88d5301d0 100644
--- a/idl/parlay/ui_interfaces.idl
+++ b/idl/parlay/ui_interfaces.idl
@@ -1,361 +1,361 @@
-//Source file: ui_interfaces.idl

-//Date:  8 October 2004

-//User Interaction Interfaces for ETSI ES 203 915-05 V1.1.1, DES/TISPAN-01005-05-OSA, Parlay 5.0

-

-

-#ifndef __UI_INTERFACES_DEFINED

-#define __UI_INTERFACES_DEFINED

-

-

-#include "osa.idl"

-#include "ui_data.idl"

-#include "gcc_interfaces.idl"

-#include "mpcc_interfaces.idl"

-

-module org {

-	

-	module csapi {

-		

-		

-		module ui {

-			interface IpUI;

-			interface IpUICall;

-			

-			enum TpUITargetObjectType {

-

-				P_UI_TARGET_OBJECT_CALL,

-				P_UI_TARGET_OBJECT_MULTI_PARTY_CALL,

-				P_UI_TARGET_OBJECT_CALL_LEG				

-			};

-			

-			

-			union TpUITargetObject switch(TpUITargetObjectType) {

-				case P_UI_TARGET_OBJECT_CALL: cc::gccs::TpCallIdentifier Call;

-				case P_UI_TARGET_OBJECT_MULTI_PARTY_CALL: cc::mpccs::TpMultiPartyCallIdentifier MultiPartyCall;

-				case P_UI_TARGET_OBJECT_CALL_LEG: cc::mpccs::TpCallLegIdentifier CallLeg;

-			};

-			

-			

-			struct TpUIIdentifier {

-				IpUI UIRef;

-				TpSessionID UserInteractionSessionID;

-			};

-			

-			

-			typedef sequence <TpUIIdentifier> TpUIIdentifierSet;

-			

-			struct TpUICallIdentifier {

-				IpUICall UICallRef;

-				TpSessionID UserInteractionSessionID;

-			};

-			

-			

-			

-			interface IpAppUI : IpInterface {

-				void sendInfoRes (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIReport response	

-					);

-					

-				void sendInfoErr (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIError error	

-					);

-					

-				void sendInfoAndCollectRes (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIReport response,	

-					in TpString collectedInfo	

-					);

-					

-				void sendInfoAndCollectErr (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIError error	

-					);

-					

-				void userInteractionFaultDetected (

-					in TpSessionID userInteractionSessionID,	

-					in TpUIFault fault	

-					);

-					

-			};

-			

-			

-			interface IpAppUICall : IpAppUI {

-				void recordMessageRes (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIReport response,	

-					in TpInt32 messageID	

-					);

-					

-				void recordMessageErr (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIError error	

-					);

-					

-				void deleteMessageRes (

-					in TpSessionID usrInteractionSessionID,	

-					in TpUIReport response,	

-					in TpAssignmentID assignmentID	

-					);

-					

-				void deleteMessageErr (

-					in TpSessionID usrInteractionSessionID,	

-					in TpUIError error,	

-					in TpAssignmentID assignmentID	

-					);

-					

-				void abortActionRes (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID	

-					);

-					

-				void abortActionErr (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIError error	

-					);

-					

-				void getMessageRes (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIInfo message	

-					);

-					

-				void getMessageErr (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIError error	

-					);

-					

-			};

-			

-			

-			interface IpAppUIManager : IpInterface {

-				void userInteractionAborted (

-					in TpUIIdentifier userInteraction	

-					);

-					

-				void userInteractionNotificationInterrupted ();

-					

-				void userInteractionNotificationContinued ();

-					

-				IpAppUI reportEventNotification (

-					in TpUIIdentifier userInteraction,	

-					in TpUIEventNotificationInfo eventNotificationInfo,	

-					in TpAssignmentID assignmentID	

-					);

-					

-				void abortMultipleUserInteractions (

-					in TpUIIdentifierSet userInteractionSet	

-					);

-					

-			};

-			

-			

-			interface IpUI : IpService {

-				TpAssignmentID sendInfoReq (

-					in TpSessionID userInteractionSessionID,	

-					in TpUIInfo info,	

-					in TpLanguage language,	

-					in TpUIVariableInfoSet variableInfo,	

-					in TpInt32 repeatIndicator,	

-					in TpUIResponseRequest responseRequested	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND);

-					

-				TpAssignmentID sendInfoAndCollectReq (

-					in TpSessionID userInteractionSessionID,	

-					in TpUIInfo info,	

-					in TpLanguage language,	

-					in TpUIVariableInfoSet variableInfo,	

-					in TpUICollectCriteria criteria,	

-					in TpUIResponseRequest responseRequested	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND,P_ILLEGAL_RANGE,P_INVALID_COLLECTION_CRITERIA);

-					

-				void release (

-					in TpSessionID userInteractionSessionID	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID);

-					

-				void setOriginatingAddress (

-					in TpSessionID userInteractionSessionID,	

-					in TpString origin	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_INVALID_ADDRESS);

-					

-				TpString getOriginatingAddress (

-					in TpSessionID userInteractionSessionID	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE);

-					

-			};

-			

-			

-			interface IpUICall : IpUI {

-				TpAssignmentID recordMessageReq (

-					in TpSessionID userInteractionSessionID,	

-					in TpUIInfo info,	

-					in TpUIMessageCriteria criteria	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND,P_INVALID_CRITERIA);

-					

-				TpAssignmentID deleteMessageReq (

-					in TpSessionID usrInteractionSessionID,	

-					in TpInt32 messageID	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_ILLEGAL_ID,P_ID_NOT_FOUND);

-					

-				void abortActionReq (

-					in TpSessionID userInteractionSessionID,	

-					in TpAssignmentID assignmentID	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_ASSIGNMENT_ID);

-					

-				TpAssignmentID getMessageReq (

-					in TpSessionID userInteractionSessionID,	

-					in TpInt32 messageID	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND);

-					

-			};

-			

-			

-			interface IpUIManager : IpService {

-				TpUIIdentifier createUI (

-					in IpAppUI appUI,	

-					in TpAddress userAddress	

-					)					

-					raises (TpCommonExceptions,P_INVALID_NETWORK_STATE,P_INVALID_INTERFACE_TYPE);

-					

-				TpUICallIdentifier createUICall (

-					in IpAppUICall appUI,	

-					in TpUITargetObject uiTargetObject	

-					)					

-					raises (TpCommonExceptions,P_INVALID_NETWORK_STATE,P_INVALID_INTERFACE_TYPE);

-					

-				TpAssignmentID createNotification (

-					in IpAppUIManager appUIManager,	

-					in TpUIEventCriteria eventCriteria	

-					)					

-					raises (TpCommonExceptions,P_INVALID_CRITERIA,P_INVALID_INTERFACE_TYPE);

-					

-				void destroyNotification (

-					in TpAssignmentID assignmentID	

-					)					

-					raises (TpCommonExceptions,P_INVALID_ASSIGNMENT_ID);

-					

-				void changeNotification (

-					in TpAssignmentID assignmentID,	

-					in TpUIEventCriteria eventCriteria	

-					)					

-					raises (TpCommonExceptions,P_INVALID_ASSIGNMENT_ID,P_INVALID_CRITERIA);

-					

-				TpUIEventCriteriaResultSet getNotification ()					

-					raises (TpCommonExceptions);

-					

-				TpAssignmentID enableNotifications (

-					in IpAppUIManager appUIManager	

-					)					

-					raises (TpCommonExceptions);

-					

-				void disableNotifications ()					

-					raises (TpCommonExceptions);

-					

-			};

-			

-			

-			interface IpAppUIAdminManager : IpInterface {

-				void getMessageRes (

-					in TpSessionID usrInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIInfo message	

-					);

-					

-				void getMessageErr (

-					in TpSessionID usrInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIError error	

-					);

-					

-				void deleteMessageRes (

-					in TpSessionID usrInteractionSessionID,	

-					in TpUIReport response,	

-					in TpAssignmentID assignmentID	

-					);

-					

-				void deleteMessageErr (

-					in TpSessionID usrInteractionSessionID,	

-					in TpUIError error,	

-					in TpAssignmentID assignmentID	

-					);

-					

-				void putMessageRes (

-					in TpSessionID usrInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpInt32 messageID	

-					);

-					

-				void putMessageErr (

-					in TpSessionID usrInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIError error	

-					);

-					

-				void getMessageListRes (

-					in TpSessionID usrInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpMessageIDList messageIDList,	

-					in TpBoolean final	

-					);

-					

-				void getMessageListErr (

-					in TpSessionID usrInteractionSessionID,	

-					in TpAssignmentID assignmentID,	

-					in TpUIError error	

-					);

-					

-			};

-			

-			

-			interface IpUIAdminManager : IpService {

-				TpAssignmentID getMessageReq (

-					in TpSessionID usrInteractionSessionID,	

-					in TpInt32 messageID	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND);

-					

-				TpAssignmentID putMessageReq (

-					in TpSessionID usrInteractionSessionID,	

-					in TpUIInfo info	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_ILLEGAL_ID,P_ID_NOT_FOUND);

-					

-				TpAssignmentID deleteMessageReq (

-					in TpSessionID usrInteractionSessionID,	

-					in TpInt32 messageID	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_ILLEGAL_ID,P_ID_NOT_FOUND);

-					

-				TpAssignmentID getMessageListReq (

-					in TpSessionID usrInteractionSessionID,	

-					in TpBoolean reset	

-					)					

-					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE);

-					

-			};

-			

-		};

-		

-	};

-	

-};

-

-#endif

+//Source file: ui_interfaces.idl
+//Date:  8 October 2004
+//User Interaction Interfaces for ETSI ES 203 915-05 V1.1.1, DES/TISPAN-01005-05-OSA, Parlay 5.0
+
+
+#ifndef __UI_INTERFACES_DEFINED
+#define __UI_INTERFACES_DEFINED
+
+
+#include "osa.idl"
+#include "ui_data.idl"
+#include "gcc_interfaces.idl"
+#include "mpcc_interfaces.idl"
+
+module org {
+	
+	module csapi {
+		
+		
+		module ui {
+			interface IpUI;
+			interface IpUICall;
+			
+			enum TpUITargetObjectType {
+
+				P_UI_TARGET_OBJECT_CALL,
+				P_UI_TARGET_OBJECT_MULTI_PARTY_CALL,
+				P_UI_TARGET_OBJECT_CALL_LEG				
+			};
+			
+			
+			union TpUITargetObject switch(TpUITargetObjectType) {
+				case P_UI_TARGET_OBJECT_CALL: cc::gccs::TpCallIdentifier Call;
+				case P_UI_TARGET_OBJECT_MULTI_PARTY_CALL: cc::mpccs::TpMultiPartyCallIdentifier MultiPartyCall;
+				case P_UI_TARGET_OBJECT_CALL_LEG: cc::mpccs::TpCallLegIdentifier CallLeg;
+			};
+			
+			
+			struct TpUIIdentifier {
+				IpUI UIRef;
+				TpSessionID UserInteractionSessionID;
+			};
+			
+			
+			typedef sequence <TpUIIdentifier> TpUIIdentifierSet;
+			
+			struct TpUICallIdentifier {
+				IpUICall UICallRef;
+				TpSessionID UserInteractionSessionID;
+			};
+			
+			
+			
+			interface IpAppUI : IpInterface {
+				void sendInfoRes (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIReport response	
+					);
+					
+				void sendInfoErr (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIError error	
+					);
+					
+				void sendInfoAndCollectRes (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIReport response,	
+					in TpString collectedInfo	
+					);
+					
+				void sendInfoAndCollectErr (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIError error	
+					);
+					
+				void userInteractionFaultDetected (
+					in TpSessionID userInteractionSessionID,	
+					in TpUIFault fault	
+					);
+					
+			};
+			
+			
+			interface IpAppUICall : IpAppUI {
+				void recordMessageRes (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIReport response,	
+					in TpInt32 messageID	
+					);
+					
+				void recordMessageErr (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIError error	
+					);
+					
+				void deleteMessageRes (
+					in TpSessionID usrInteractionSessionID,	
+					in TpUIReport response,	
+					in TpAssignmentID assignmentID	
+					);
+					
+				void deleteMessageErr (
+					in TpSessionID usrInteractionSessionID,	
+					in TpUIError error,	
+					in TpAssignmentID assignmentID	
+					);
+					
+				void abortActionRes (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID	
+					);
+					
+				void abortActionErr (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIError error	
+					);
+					
+				void getMessageRes (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIInfo message	
+					);
+					
+				void getMessageErr (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIError error	
+					);
+					
+			};
+			
+			
+			interface IpAppUIManager : IpInterface {
+				void userInteractionAborted (
+					in TpUIIdentifier userInteraction	
+					);
+					
+				void userInteractionNotificationInterrupted ();
+					
+				void userInteractionNotificationContinued ();
+					
+				IpAppUI reportEventNotification (
+					in TpUIIdentifier userInteraction,	
+					in TpUIEventNotificationInfo eventNotificationInfo,	
+					in TpAssignmentID assignmentID	
+					);
+					
+				void abortMultipleUserInteractions (
+					in TpUIIdentifierSet userInteractionSet	
+					);
+					
+			};
+			
+			
+			interface IpUI : IpService {
+				TpAssignmentID sendInfoReq (
+					in TpSessionID userInteractionSessionID,	
+					in TpUIInfo info,	
+					in TpLanguage language,	
+					in TpUIVariableInfoSet variableInfo,	
+					in TpInt32 repeatIndicator,	
+					in TpUIResponseRequest responseRequested	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND);
+					
+				TpAssignmentID sendInfoAndCollectReq (
+					in TpSessionID userInteractionSessionID,	
+					in TpUIInfo info,	
+					in TpLanguage language,	
+					in TpUIVariableInfoSet variableInfo,	
+					in TpUICollectCriteria criteria,	
+					in TpUIResponseRequest responseRequested	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND,P_ILLEGAL_RANGE,P_INVALID_COLLECTION_CRITERIA);
+					
+				void release (
+					in TpSessionID userInteractionSessionID	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID);
+					
+				void setOriginatingAddress (
+					in TpSessionID userInteractionSessionID,	
+					in TpString origin	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_INVALID_ADDRESS);
+					
+				TpString getOriginatingAddress (
+					in TpSessionID userInteractionSessionID	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE);
+					
+			};
+			
+			
+			interface IpUICall : IpUI {
+				TpAssignmentID recordMessageReq (
+					in TpSessionID userInteractionSessionID,	
+					in TpUIInfo info,	
+					in TpUIMessageCriteria criteria	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND,P_INVALID_CRITERIA);
+					
+				TpAssignmentID deleteMessageReq (
+					in TpSessionID usrInteractionSessionID,	
+					in TpInt32 messageID	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_ILLEGAL_ID,P_ID_NOT_FOUND);
+					
+				void abortActionReq (
+					in TpSessionID userInteractionSessionID,	
+					in TpAssignmentID assignmentID	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_ASSIGNMENT_ID);
+					
+				TpAssignmentID getMessageReq (
+					in TpSessionID userInteractionSessionID,	
+					in TpInt32 messageID	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND);
+					
+			};
+			
+			
+			interface IpUIManager : IpService {
+				TpUIIdentifier createUI (
+					in IpAppUI appUI,	
+					in TpAddress userAddress	
+					)					
+					raises (TpCommonExceptions,P_INVALID_NETWORK_STATE,P_INVALID_INTERFACE_TYPE);
+					
+				TpUICallIdentifier createUICall (
+					in IpAppUICall appUI,	
+					in TpUITargetObject uiTargetObject	
+					)					
+					raises (TpCommonExceptions,P_INVALID_NETWORK_STATE,P_INVALID_INTERFACE_TYPE);
+					
+				TpAssignmentID createNotification (
+					in IpAppUIManager appUIManager,	
+					in TpUIEventCriteria eventCriteria	
+					)					
+					raises (TpCommonExceptions,P_INVALID_CRITERIA,P_INVALID_INTERFACE_TYPE);
+					
+				void destroyNotification (
+					in TpAssignmentID assignmentID	
+					)					
+					raises (TpCommonExceptions,P_INVALID_ASSIGNMENT_ID);
+					
+				void changeNotification (
+					in TpAssignmentID assignmentID,	
+					in TpUIEventCriteria eventCriteria	
+					)					
+					raises (TpCommonExceptions,P_INVALID_ASSIGNMENT_ID,P_INVALID_CRITERIA);
+					
+				TpUIEventCriteriaResultSet getNotification ()					
+					raises (TpCommonExceptions);
+					
+				TpAssignmentID enableNotifications (
+					in IpAppUIManager appUIManager	
+					)					
+					raises (TpCommonExceptions);
+					
+				void disableNotifications ()					
+					raises (TpCommonExceptions);
+					
+			};
+			
+			
+			interface IpAppUIAdminManager : IpInterface {
+				void getMessageRes (
+					in TpSessionID usrInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIInfo message	
+					);
+					
+				void getMessageErr (
+					in TpSessionID usrInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIError error	
+					);
+					
+				void deleteMessageRes (
+					in TpSessionID usrInteractionSessionID,	
+					in TpUIReport response,	
+					in TpAssignmentID assignmentID	
+					);
+					
+				void deleteMessageErr (
+					in TpSessionID usrInteractionSessionID,	
+					in TpUIError error,	
+					in TpAssignmentID assignmentID	
+					);
+					
+				void putMessageRes (
+					in TpSessionID usrInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpInt32 messageID	
+					);
+					
+				void putMessageErr (
+					in TpSessionID usrInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIError error	
+					);
+					
+				void getMessageListRes (
+					in TpSessionID usrInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpMessageIDList messageIDList,	
+					in TpBoolean final	
+					);
+					
+				void getMessageListErr (
+					in TpSessionID usrInteractionSessionID,	
+					in TpAssignmentID assignmentID,	
+					in TpUIError error	
+					);
+					
+			};
+			
+			
+			interface IpUIAdminManager : IpService {
+				TpAssignmentID getMessageReq (
+					in TpSessionID usrInteractionSessionID,	
+					in TpInt32 messageID	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE,P_ILLEGAL_ID,P_ID_NOT_FOUND);
+					
+				TpAssignmentID putMessageReq (
+					in TpSessionID usrInteractionSessionID,	
+					in TpUIInfo info	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_ILLEGAL_ID,P_ID_NOT_FOUND);
+					
+				TpAssignmentID deleteMessageReq (
+					in TpSessionID usrInteractionSessionID,	
+					in TpInt32 messageID	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_ILLEGAL_ID,P_ID_NOT_FOUND);
+					
+				TpAssignmentID getMessageListReq (
+					in TpSessionID usrInteractionSessionID,	
+					in TpBoolean reset	
+					)					
+					raises (TpCommonExceptions,P_INVALID_SESSION_ID,P_INVALID_NETWORK_STATE);
+					
+			};
+			
+		};
+		
+	};
+	
+};
+
+#endif
diff --git a/image/capinfos.rc.in b/image/capinfos.rc.in
index e82463d6c6..e82463d6c6 100755..100644
--- a/image/capinfos.rc.in
+++ b/image/capinfos.rc.in