diff options
Diffstat (limited to 'src/wixext/MsmqCompiler.cs')
-rw-r--r-- | src/wixext/MsmqCompiler.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/wixext/MsmqCompiler.cs b/src/wixext/MsmqCompiler.cs index 15c3f3ca..cfc4ef65 100644 --- a/src/wixext/MsmqCompiler.cs +++ b/src/wixext/MsmqCompiler.cs | |||
@@ -7,7 +7,7 @@ namespace WixToolset.Msmq | |||
7 | using System.Xml.Linq; | 7 | using System.Xml.Linq; |
8 | using WixToolset.Data; | 8 | using WixToolset.Data; |
9 | using WixToolset.Extensibility; | 9 | using WixToolset.Extensibility; |
10 | using WixToolset.Msmq.Tuples; | 10 | using WixToolset.Msmq.Symbols; |
11 | 11 | ||
12 | /// <summary> | 12 | /// <summary> |
13 | /// The compiler for the WiX Toolset MSMQ Extension. | 13 | /// The compiler for the WiX Toolset MSMQ Extension. |
@@ -221,7 +221,7 @@ namespace WixToolset.Msmq | |||
221 | } | 221 | } |
222 | } | 222 | } |
223 | 223 | ||
224 | var tuple = section.AddTuple(new MessageQueueTuple(sourceLineNumbers, id) | 224 | var symbol = section.AddSymbol(new MessageQueueSymbol(sourceLineNumbers, id) |
225 | { | 225 | { |
226 | ComponentRef = componentId, | 226 | ComponentRef = componentId, |
227 | Label = label, | 227 | Label = label, |
@@ -233,24 +233,24 @@ namespace WixToolset.Msmq | |||
233 | 233 | ||
234 | if (CompilerConstants.IntegerNotSet != basePriority) | 234 | if (CompilerConstants.IntegerNotSet != basePriority) |
235 | { | 235 | { |
236 | tuple.BasePriority = basePriority; | 236 | symbol.BasePriority = basePriority; |
237 | } | 237 | } |
238 | if (CompilerConstants.IntegerNotSet != journalQuota) | 238 | if (CompilerConstants.IntegerNotSet != journalQuota) |
239 | { | 239 | { |
240 | tuple.JournalQuota = journalQuota; | 240 | symbol.JournalQuota = journalQuota; |
241 | } | 241 | } |
242 | 242 | ||
243 | if (CompilerConstants.IntegerNotSet != privLevel) | 243 | if (CompilerConstants.IntegerNotSet != privLevel) |
244 | { | 244 | { |
245 | tuple.PrivLevel = privLevel; | 245 | symbol.PrivLevel = privLevel; |
246 | } | 246 | } |
247 | if (CompilerConstants.IntegerNotSet != quota) | 247 | if (CompilerConstants.IntegerNotSet != quota) |
248 | { | 248 | { |
249 | tuple.Quota = quota; | 249 | symbol.Quota = quota; |
250 | } | 250 | } |
251 | 251 | ||
252 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "MessageQueuingInstall"); | 252 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingInstall"); |
253 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "MessageQueuingUninstall"); | 253 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingUninstall"); |
254 | } | 254 | } |
255 | 255 | ||
256 | /// <summary> | 256 | /// <summary> |
@@ -283,7 +283,7 @@ namespace WixToolset.Msmq | |||
283 | this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); | 283 | this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); |
284 | } | 284 | } |
285 | messageQueueId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); | 285 | messageQueueId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); |
286 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, MsmqTupleDefinitions.MessageQueue, messageQueueId); | 286 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, MsmqSymbolDefinitions.MessageQueue, messageQueueId); |
287 | break; | 287 | break; |
288 | case "User": | 288 | case "User": |
289 | if (null != group) | 289 | if (null != group) |
@@ -490,7 +490,7 @@ namespace WixToolset.Msmq | |||
490 | 490 | ||
491 | if (null != user) | 491 | if (null != user) |
492 | { | 492 | { |
493 | section.AddTuple(new MessageQueueUserPermissionTuple(sourceLineNumbers, id) | 493 | section.AddSymbol(new MessageQueueUserPermissionSymbol(sourceLineNumbers, id) |
494 | { | 494 | { |
495 | ComponentRef = componentId, | 495 | ComponentRef = componentId, |
496 | MessageQueueRef = messageQueueId, | 496 | MessageQueueRef = messageQueueId, |
@@ -500,7 +500,7 @@ namespace WixToolset.Msmq | |||
500 | } | 500 | } |
501 | if (null != group) | 501 | if (null != group) |
502 | { | 502 | { |
503 | section.AddTuple(new MessageQueueGroupPermissionTuple(sourceLineNumbers, id) | 503 | section.AddSymbol(new MessageQueueGroupPermissionSymbol(sourceLineNumbers, id) |
504 | { | 504 | { |
505 | ComponentRef = componentId, | 505 | ComponentRef = componentId, |
506 | MessageQueueRef = messageQueueId, | 506 | MessageQueueRef = messageQueueId, |