Add sleep time option "-st".

Add queue manager name option "-qm".

MQSLoad.java

@@ -1,14 +1,14 @@
 // $RCSfile: MQSLoad.java,v $
-// $Revision: 1.6 $
+// $Revision: 1.10 $
 // $Name:  $
-// $Date: 2002/05/06 09:52:24 $
+// $Date: 2007/12/11 16:46:37 $
-// $Author: giberta1 $
+// $Author: agibert $
 
 /*
  * MQSLoad.java - Data file to MQ/Series queue loader
- * Copyright (C) 2001-2002 Arnaud G. Gibert
+ * Copyright (C) 2001-2006 Arnaud G. Gibert
- * arnaud.gibert@misys.com
+ * mailto:arnaud@rx3.net
- * www.miys-ibs.fr
+ * http://www.rx3.org/dvp/MQSLoad
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -35,7 +35,7 @@ import java.text.*;
 
 public class MQSLoad
 {
-        private MQQueueManager  QMng;
+        private MQQueueManager  QMng = null;
         private String          QMng_Name = "";
         private MQQueue         MsgQ;
         private String          MsgQ_Name;
@@ -43,8 +43,14 @@ public class MQSLoad
         private String          File_Name;
         private String		Field_Break = "";
         private String		Message_Break = "\r\n";
+        private String		Message_Tail = "";
         private boolean		Keep_Message_Break = false;
-        
+        private String		MQSLoad_Revision = "$Revision: 1.10 $";
+	private String    	MQSLoad_Tag      = "$Name:  $";
+	private	String    	MQSLoad_Date     = "$Date: 2007/12/11 16:46:37 $";
+	private	String 		MQSLoad_Author   = "$Author: agibert $";
+        private Integer		Sleep_Time 	 = 0;
+
 
 
 
@@ -198,7 +204,19 @@ public class MQSLoad
                 {
 			while( argc < args.length)
                         {
-                		if( args[argc].equals( "-fb"))
+                		if( args[argc].equals( "-qm"))
+                		{
+                			if( argc < ( args.length + 1))
+                			{
+                        			QMng_Name = Str_Format( args[++argc]);
+                        		}
+                        		else
+                        		{
+                        			System.out.println( "Invalid number of command line options...");
+                        			throw new Exception();
+                        		}
+                		}
+                		else if( args[argc].equals( "-fb"))
                 		{
                 			if( argc < ( args.length + 1))
                 			{
@@ -222,7 +240,31 @@ public class MQSLoad
                         			throw new Exception();
                         		}
                 		}
-                		else if ( args[argc].equals( "-kmb"))
+                		else if ( args[argc].equals( "-mt"))
+                		{
+                			if( argc < ( args.length + 1))
+                			{
+                        			Message_Tail = Str_Format( args[++argc]);
+                        		}
+                        		else
+                        		{
+                        			System.out.println( "Invalid number of command line options...");
+                        			throw new Exception();
+                        		}
+                		}
+                		else if ( args[argc].equals( "-st"))
+				{
+					if( argc < ( args.length + 1))
+					{
+						Sleep_Time = Integer.parseInt( args[++argc]);
+					}
+					else
+					{
+						System.out.println( "Invalid number of command line options...");
+						throw new Exception();
+					}
+				}
+				else if ( args[argc].equals( "-kmb"))
                 		{
                 			Keep_Message_Break = true;
                 		}
@@ -258,15 +300,27 @@ public class MQSLoad
 	
       	private void MQSInit() throws Exception
         {
-                try
+		short  	     retry = 0;
-                {
+		final short  RETRY_MAX = 10;
-                        QMng = new MQQueueManager( QMng_Name);
+
-//                        System.out.println( "QManager Open: (" + QMng + ") !");
+
-                }
+		while( QMng == null)
+		{
+	                try
+        	        {
+                	        QMng = new MQQueueManager( QMng_Name);
+//                        	System.out.println( "QManager Open: (" + QMng + ") !");
+                	}
                 
-                catch( Exception Expt)
+                	catch( Exception Expt)
-                {                       
+                	{
-                        throw Expt;
+				System.out.print("!");
+
+				if( retry++ > RETRY_MAX)
+				{
+	                        	throw Expt;
+				}
+                	}
                 }
                 
                 try
@@ -357,6 +411,32 @@ public class MQSLoad
 	
 	
 	
+	//-------------------------------------------------------------------------------------------------------------------------
+	//
+	//-------------------------------------------------------------------------------------------------------------------------
+
+	private void Stand_By(int timer)
+	{
+	        if( timer > 0)
+		{
+			try
+			{
+			        synchronized( this)
+				{ 
+					wait( timer);				
+				}
+			}
+			catch(InterruptedException  ie)
+			{
+				ie.printStackTrace();
+			}
+		}
+	}
+
+
+
+
+
 	//-------------------------------------------------------------------------------------------------------------------------
 	//
 	//-------------------------------------------------------------------------------------------------------------------------
@@ -444,6 +524,8 @@ public class MQSLoad
 						if( next_message <= cur_window_size)
 						{
 //							System.out.println( "* Write Msg CurPos: (" + cur_pos + ")");
+							output_msg.writeString( Message_Tail);
+
 							if( Keep_Message_Break)
 							{
 								output_msg.writeString( Message_Break);
@@ -456,6 +538,8 @@ public class MQSLoad
 		                                        cur_pos += Message_Break.length();
 		                                        
 		                                        Counter_Print( msg_nb++);
+
+							Stand_By( Sleep_Time);
 		                		}
 					}
 					
@@ -475,6 +559,8 @@ public class MQSLoad
                                 MQSPut_Msg( output_msg);
                                 
                                 Counter_Print( msg_nb++);
+
+				Stand_By( Sleep_Time);
         		}
 
 	                System.out.println( "\n");
@@ -505,11 +591,12 @@ public class MQSLoad
 		
 		try
 		{
+			System.out.println("MQSLoad: " + MQSLoad_Tag + " / " + MQSLoad_Date + " / " + MQSLoad_Author);
                                       
-                        if( ( args.length < 2) || ( args.length > 6))
+                        if( ( args.length < 2) || ( args.length > 8))
                         {
-                                System.out.println( "Usage: MQSLoad [-fb \"field_break\"] [-mb \"message_break\"] [-kmb] <Output_MsgQueue_Name> <Input_File_Name>");
+                                System.out.println( "Usage: MQSLoad [-qm \"Output_QueueMng_Name\"] [-fb \"field_break\"] [-mb \"message_break\"] [-mt \"message_tail\"] [-kmb] <Output_MsgQueue_Name> <Input_File_Name>");
-                                System.out.println( "       Default: Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Keep Message Break: (" + Keep_Message_Break + ")");
+                                System.out.println( "       Default: Output QueueMng Name: (" + QMng_Name + ")   Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Message Tail: (" + Str_UnFormat( Message_Tail) + ")   Sleep Time: (" + Sleep_Time + ")   Keep Message Break: (" + Keep_Message_Break + ")");
 
 				System.exit( 1);
                         }
@@ -519,8 +606,8 @@ public class MQSLoad
                                 
                                 Arg_Parse( args);
                     
-                                System.out.println( "Output MsgQueue Name: (" + MsgQ_Name + ")   Input File Name: (" + File_Name + ")");
+                                System.out.println( "Output QueueMng Name: (" + QMng_Name + ")   Output MsgQueue Name: (" + MsgQ_Name + ")   Input File Name: (" + File_Name + ")");
-                                System.out.println( "Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Keep Message Break: (" + Keep_Message_Break + ")");
+                                System.out.println( "Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Message Tail: (" + Str_UnFormat( Message_Tail) + ")   Sleep Time: (" + Sleep_Time + ")   Keep Message Break: (" + Keep_Message_Break + ")");
                 
                                 MQSInit();
 

ReadMe.txt

@@ -1,8 +1,8 @@
 # $RCSfile: ReadMe.txt,v $
-# $Revision: 1.6 $
+# $Revision: 1.8 $
 # $Name:  $
-# $Date: 2002/05/02 17:24:15 $
+# $Date: 2007/12/11 16:46:37 $
-# $Author: giberta1 $
+# $Author: agibert $
 
 
 
@@ -24,7 +24,7 @@ Installation:
 Notes:
 ------
 
-	- MQSLoad has been tested with MQ/Series 5.2,
+	- MQSLoad has been tested with MQ/Series 5.2, 5.3 and WMQ 6.0
 
 	- "-fb" and "-mb" arguments accept a string with formated escape character:
 		+ "\n" for newline,
@@ -34,6 +34,7 @@ Notes:
 
 	- Message breaks are used for message separation in the batch file,
 	- Message breaks are striped from the sended message if "-kmb" (keep message break) is not set,
+	- Message tail specified after "-mt" option is inserted between message and message break,
 	- Field breaks are striped from the sended message.
  
 	- Windows text files: newline is specified as "\r\n",
@@ -55,5 +56,7 @@ Usage Examples:
 		java MQSLoad -mb "---MESSAGE-BREAK---\r\n" SWIFT-QUEUE swift-batch.txt
 	- To load a raw swift batch file "swift-batch-raw.txt" with "}\r\n" message break into the MQ/Series "SWIFT-QUEUE" and by keeping message break separator use:
 		java MQSLoad -mb "}\r\n" -kmb SWIFT-QUEUE swift-batch-raw.txt
+	- To load a raw swift batch file "swift-batch-raw.txt" with "}\r\n" message break into the MQ/Series "SWIFT-QUEUE" and by keeping only "}" as end of message use:
+		java MQSLoad -mb "}\r\n" -mt "}" SWIFT-QUEUE swift-batch-raw.txt
 	- To load a csv batch file "batch.csv" with ";" field separator into the MQ/Series "DATA-QUEUE" use:
 		java MQSLoad -fb ";" DATA-QUEUE csv-batch.csv

ReleaseNotes.txt

@@ -1,15 +1,41 @@
 # $RCSfile: ReleaseNotes.txt,v $
-# $Revision: 1.4 $
+# $Revision: 1.8 $
 # $Name:  $
-# $Date: 2002/05/06 09:57:19 $
+# $Date: 2007/12/11 16:46:37 $
-# $Author: giberta1 $
+# $Author: agibert $
 
 
 
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.1.2 - A. Gibert - 06/05/02
+MQSLoad V 1.3.0 - C. Colin / A. Gibert - 2007/12/10
+--------------------------------------------------------------------------------
+
+Add sleep time option "-st".
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.2.0 - A. Gibert - 2007/06/05
+--------------------------------------------------------------------------------
+
+Add queue manager name option "-qm".
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.1.4 - A. Gibert - 2002/05/21
+--------------------------------------------------------------------------------
+
+Add message tail option "-mt",
+Add MQQueueManager() auto retry,
+Add version, date and author print out.
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.1.2 - A. Gibert - 2002/05/06
 --------------------------------------------------------------------------------
 
 Add return code handling.
@@ -17,7 +43,7 @@ Add return code handling.
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.1.1 - A. Gibert - 02/05/02
+MQSLoad V 1.1.1 - A. Gibert - 2002/05/02
 --------------------------------------------------------------------------------
 
 Add Keep Message Break support,
@@ -26,7 +52,7 @@ Add -kmb option.
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.1.0 - A. Gibert - 23/04/02
+MQSLoad V 1.1.0 - A. Gibert - 2002/04/23
 --------------------------------------------------------------------------------
 
 Add string field break and string message break support,
@@ -41,7 +67,7 @@ Add GPL and FDL licenses files.
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.0.0 - A. Gibert - 12/07/01
+MQSLoad V 1.0.0 - A. Gibert - 20001/07/12
 --------------------------------------------------------------------------------
 
 First release,

test-swift-batch-big1.txt

@@ -70,7 +70,7 @@ MAROC
 :71A:BEN
 -}{5:{MAC:BCED2F18}{CHK:075B64FB4533}}
 ---MESSAGE-BREAK---
-SWIFTABORT                                                                                                                              
+SWIFTERROR                                                                                                                              
 ---MESSAGE-BREAK---
 SWIFTBEGIN                                                                                                                              
 ---MESSAGE-BREAK---