Changeset 4107
- Timestamp:
- 10/08/07 00:10:00 (1 year ago)
- Files:
-
- trunk/nuxleus/Scripts/llup-pub.sh (modified) (1 diff)
- trunk/nuxleus/src/Nuxleus.Messaging/IMessage.cs (added)
- trunk/nuxleus/src/Nuxleus.Messaging/IMessageQueue.cs (added)
- trunk/nuxleus/src/Nuxleus.Messaging/MSMQ (added)
- trunk/nuxleus/src/Nuxleus.Messaging/QS (added)
- trunk/nuxleus/src/Nuxleus.Messaging/QS/Message.cs (added)
- trunk/nuxleus/src/Nuxleus.Messaging/QS/MessageQueue.cs (added)
- trunk/nuxleus/src/Nuxleus.Messaging/QS/MessageQueueService.cs (added)
- trunk/nuxleus/src/Nuxleus.Messaging/XMPP (added)
- trunk/nuxleus/src/Nuxleus.PubSub/Bucker/message.cs (modified) (3 diffs)
- trunk/nuxleus/src/Nuxleus.PubSub/Bucker/queueclient.cs (modified) (1 diff)
- trunk/nuxleus/src/Xameleon/Function/QueueManager.cs (modified) (1 diff)
- trunk/nuxleus/src/nux.build (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/nuxleus/Scripts/llup-pub.sh
r3980 r4107 42 42 echo "Starting the llup publisher server on port $PORT against queue server at $QUEUE_SERVER and monitoring $2" 43 43 # add -v to the line below to enable logging to the console 44 llup-queue-publisher.py - v -s $QUEUE_SERVER -q $2 -i $PID_FILE -f 5.0 &44 llup-queue-publisher.py -s $QUEUE_SERVER -q $2 -i $PID_FILE -f 5.0 & 45 45 ;; 46 46 trunk/nuxleus/src/Nuxleus.PubSub/Bucker/message.cs
r4089 r4107 232 232 233 233 [XmlElement (ElementName="op", Type=typeof(Operation))] 234 public Operation Op = n ull;234 public Operation Op = new Operation(); 235 235 236 236 [XmlElement (ElementName="error", Type=typeof(Error))] … … 251 251 XmlSerializer serializer = new XmlSerializer(typeof(Message)); 252 252 return (Message)serializer.Deserialize(stream); 253 } 254 255 public static Message Parse(byte[] bytes) { 256 MemoryStream stream = new MemoryStream(bytes); 257 XmlSerializer serializer = new XmlSerializer(typeof(Message)); 258 Message m = (Message)serializer.Deserialize(stream); 259 stream.Close(); 260 return m; 253 261 } 254 262 … … 267 275 return sb.ToString(); 268 276 } 277 278 public static byte[] Serialize(Message message) { 279 return Encoding.UTF8.GetBytes(message.ToString()); 280 } 281 282 public static byte[] Serialize(Message message, Encoding encoding) { 283 return encoding.GetBytes(message.ToString()); 284 } 269 285 } 270 286 } trunk/nuxleus/src/Nuxleus.PubSub/Bucker/queueclient.cs
r4089 r4107 260 260 ms.Data.Append(Encoding.UTF8.GetString(ms.Buffer, 0, bytesRead)); 261 261 try { 262 Message m = Message.Parse(ms.Data.ToString()); 262 char[] charsToTrim = {'\r', '\n'}; 263 Message m = Message.Parse(ms.Data.ToString().TrimEnd(charsToTrim)); 263 264 ms.OnMessageReceived(new MessageStateEventArgs(m)); 264 265 } catch (XmlException xe) { trunk/nuxleus/src/Xameleon/Function/QueueManager.cs
r4089 r4107 18 18 // The actual Queue Message to send 19 19 Message pm = new Message(); 20 pm.Op = new Operation();21 20 pm.Op.Type = OperationType.PushMessage; 22 21 pm.QueueId = queueName; trunk/nuxleus/src/nux.build
r4103 r4107 266 266 </references> 267 267 </csc> 268 </target> 268 </target> 269 269 <target name="Nuxleus.Logging" depends="init"> 270 270 <csc target="library" output="${build.dir}/Nuxleus.Logging.dll"> … … 278 278 </csc> 279 279 </target> 280 <target name="Nuxleus.Messaging" depends="init"> 280 <<<<<<< .mine 281 <target name="Nuxleus.Messaging" depends="init Nuxleus.PubSub"> 281 282 <csc target="library" output="${build.dir}/Nuxleus.Messaging.dll"> 282 283 <sources> … … 286 287 <include name="System.dll"/> 287 288 <include name="System.Xml.dll"/> 289 <include name="${build.dir}/Nuxleus.PubSub.dll"/> 290 <include name="${dependencies.dir}/ALAZ.SystemEx.NetEx.dll"/> 291 <include name="${dependencies.dir}/ALAZ.SystemEx.dll"/> 288 292 </references> 289 293 </csc>
