From cadfd47a094dd47a62d41388fb4014dace79f1b8 Mon Sep 17 00:00:00 2001 From: David Garratt Date: Sun, 16 Jun 2024 19:08:38 +0100 Subject: [PATCH] Update to install4j build config --- b6Middleware/b6middleware.install4j | 32 +++-- b6Middleware/c4jMiddleware.jar | Bin 396732 -> 397990 bytes .../Connector/InboundConnectorABSTRACT.java | 5 + .../Connector/OutboundConnectorABSTRACT.java | 5 + .../commander4j/Interface/Mapping/Map.java | 51 +++++++- .../src/com/commander4j/mw/StartGUI.java | 121 +++++++++--------- .../src/com/commander4j/mw/StartMain.java | 38 ++++-- .../src/com/commander4j/mw/StartService.java | 14 +- 8 files changed, 179 insertions(+), 87 deletions(-) diff --git a/b6Middleware/b6middleware.install4j b/b6Middleware/b6middleware.install4j index 0baa3ba..b5a34ed 100644 --- a/b6Middleware/b6middleware.install4j +++ b/b6Middleware/b6middleware.install4j @@ -1,7 +1,7 @@ - + @@ -646,29 +646,43 @@ return console.askYesNo(message, true); - - + + - - - + + + - - + + - + + + + + + + + + + + + + + + diff --git a/b6Middleware/c4jMiddleware.jar b/b6Middleware/c4jMiddleware.jar index e4757212f81e6b241217d2234f7529a0a3e14d69..eba2d11f3b3f9ccc446f8bf732dfa2cb0bb2d2d4 100644 GIT binary patch delta 19198 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 delta 18365 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 VNLPz5t$b;yCBic98@Mm@e*n!9Bv1eV diff --git a/b6Middleware/src/ABSTRACT/com/commander4j/Connector/InboundConnectorABSTRACT.java b/b6Middleware/src/ABSTRACT/com/commander4j/Connector/InboundConnectorABSTRACT.java index 5c0f9c4..d5d1069 100644 --- a/b6Middleware/src/ABSTRACT/com/commander4j/Connector/InboundConnectorABSTRACT.java +++ b/b6Middleware/src/ABSTRACT/com/commander4j/Connector/InboundConnectorABSTRACT.java @@ -130,6 +130,11 @@ public boolean getEnabled() return this.enabled; } + public void resetInBoundConnectorCount() + { + inboundConnectorMessageCount = (long) 0; + } + public Boolean processInboundFile(String filename) { Boolean result = false; diff --git a/b6Middleware/src/ABSTRACT/com/commander4j/Connector/OutboundConnectorABSTRACT.java b/b6Middleware/src/ABSTRACT/com/commander4j/Connector/OutboundConnectorABSTRACT.java index 9bcdc62..1f4e3b2 100644 --- a/b6Middleware/src/ABSTRACT/com/commander4j/Connector/OutboundConnectorABSTRACT.java +++ b/b6Middleware/src/ABSTRACT/com/commander4j/Connector/OutboundConnectorABSTRACT.java @@ -34,6 +34,11 @@ public Long getOutboundConnectorCount() { return outboundConnectorCount; } + + public void resetOutBoundConnectorCount() + { + outboundConnectorCount = (long) 0; + } public OutboundInterface getOutboundInterface() { diff --git a/b6Middleware/src/com/commander4j/Interface/Mapping/Map.java b/b6Middleware/src/com/commander4j/Interface/Mapping/Map.java index 6e960fa..b693545 100644 --- a/b6Middleware/src/com/commander4j/Interface/Mapping/Map.java +++ b/b6Middleware/src/com/commander4j/Interface/Mapping/Map.java @@ -36,11 +36,23 @@ public Long getInboundMapMessageCount() public void resetOutboundMapMessageCount() { outboundMapMsgCount = (long) 0; + + int OutboundIntCount = getNumberofOutboundInterfaces(); + + if (OutboundIntCount > 0) + { + for (int x = 0; x < OutboundIntCount; x++) + { + getOutBoundInterface(x).connector.resetOutBoundConnectorCount(); + } + } } public void resetInboundMapMessageCount() { inboundMapMsgCount = (long) 0; + + getInboundInterface().connector.resetInBoundConnectorCount(); } public Long getOutboundMapMessageCount() @@ -52,23 +64,52 @@ public String toString() { int OutboundIntCount = getNumberofOutboundInterfaces(); String outboundTypeList = ""; + String outboundPathList = ""; if (OutboundIntCount > 0) { for (int x = 0; x < OutboundIntCount; x++) - { - getOutBoundInterface(x).getType(); + { if (x > 0) { outboundTypeList = outboundTypeList + "+"; } outboundTypeList = outboundTypeList + getOutBoundInterface(x).getType(); - + outboundPathList = outboundPathList + "
" +util.padString("",true,70," ")+util.padString(getOutBoundInterface(x).getType(),true,10," ")+" "+util.padString(getOutBoundInterface(x).connector.getOutboundConnectorCount().toString(),true,5," ")+" "+getOutBoundInterface(x).getOutputPath(); + +// System.out.println("----------------------------"); +// System.out.println("Map ID :"+getId()); +// System.out.println("Map Description :"+getDescription()); +// System.out.println("Map InboundMapMessageCount :"+getInboundMapMessageCount()); +// System.out.println("Map OutboundMapMessageCount :"+getOutboundMapMessageCount()); +// System.out.println("Interface ID :"+getOutBoundInterface(x).getId()); +// System.out.println("Interface Description :"+getOutBoundInterface(x).getDescription()); +// System.out.println("Connector Type :"+getOutBoundInterface(x).connector.getType()); +// System.out.println("Connector Path :"+getOutBoundInterface(x).connector.getPath()); +// System.out.println("Connector Count :"+getOutBoundInterface(x).connector.getOutboundConnectorCount()); +// System.out.println("----------------------------"); } } - return util.padString(getId(), true, 7, " ") + " " + util.padString(getDescription(), true, 70, " ") + " " + util.padString(getInboundInterface().getType(), true, 10, " ") + " " + util.padString(outboundTypeList, true, 12, " ") - + util.padString(getInboundMapMessageCount().toString(), false, 8, " ") + " " + util.padString(getOutboundMapMessageCount().toString(), false, 8, " ") + " " + getInboundInterface().getInputPath(); + + String result = ""+ + util.padString(getId(), true, 7, " ") + + " " + + util.padString(getDescription(), true, 35, " ") + + ""+ + util.padString(getInboundMapMessageCount().toString(), false, 8, " ") + + " " + "" + + util.padString(getOutboundMapMessageCount().toString(), false, 8, " ") + + " "+""+ + util.padString(getInboundInterface().getType(), true, 10, " ") + + " " + + util.padString(getInboundInterface().connector.getInboundConnectorMessageCount().toString(),true,5," ")+ + " " + + getInboundInterface().getInputPath()+outboundPathList+""; + + result = result.replace(" ", " "); + + return result; } public void setId(String ID) diff --git a/b6Middleware/src/com/commander4j/mw/StartGUI.java b/b6Middleware/src/com/commander4j/mw/StartGUI.java index 94eddb0..c50103a 100644 --- a/b6Middleware/src/com/commander4j/mw/StartGUI.java +++ b/b6Middleware/src/com/commander4j/mw/StartGUI.java @@ -24,7 +24,6 @@ import javax.swing.ListModel; import javax.swing.ListSelectionModel; import javax.swing.SwingConstants; -import javax.swing.border.BevelBorder; import javax.swing.border.EmptyBorder; import com.commander4j.Interface.Mapping.Map; @@ -37,12 +36,10 @@ public class StartGUI extends JFrame private static final long serialVersionUID = 1L; private JPanel contentPane; - // private StartMW smw = new StartMW(); private JButton btnStart; private JButton btnStop; - private JPanel panelStatus = new JPanel(); - private JLabel lblStatus = new JLabel("Ready"); - private JPanel progressBarInterface = new JPanel(); + + private JLabel lblStatus = new JLabel(); private final JLabel lblInterfaceStatus = new JLabel("Interface Status :"); private JLabel label_NoOfMaps = new JLabel(""); private JList4j listMaps = new JList4j(); @@ -61,10 +58,11 @@ private void ConfirmExit() if (question == 0) { - Common.smw.StopMiddleware(); + Common.smw.stopMaps(); System.exit(0); } - } else + } + else { System.exit(0); } @@ -83,20 +81,20 @@ private void populateList(String defaultitem) DefaultComboBoxModel defComboBoxMod = new DefaultComboBoxModel(); int sel = -1; - if (Common.smw.isRunning()) - { - for (int j = 0; j < Common.smw.cfg.getMaps().size(); j++) - { - defComboBoxMod.addElement(Common.smw.cfg.getMaps().get(j)); + for (int j = 0; j < Common.smw.cfg.getMaps().size(); j++) + { + defComboBoxMod.addElement(Common.smw.cfg.getMaps().get(j)); - } } + ListModel jList1Model = defComboBoxMod; listMaps.setModel(jList1Model); listMaps.setCellRenderer(Common.renderer_list); listMaps.ensureIndexIsVisible(sel); + + label_NoOfMaps.setText(String.valueOf(Common.smw.cfg.getMaps().size())); } public static void main(String[] args) @@ -108,9 +106,9 @@ public void run() try { frame = new StartGUI(); - + GraphicsDevice gd = Utility.getGraphicsDevice(); - + GraphicsConfiguration gc = gd.getDefaultConfiguration(); Rectangle screenBounds = gc.getBounds(); @@ -119,7 +117,8 @@ public void run() frame.setVisible(true); - } catch (Exception e) + } + catch (Exception e) { e.printStackTrace(); } @@ -136,16 +135,15 @@ public StartGUI() setTitle("Commander4j Middleware" + " " + StartMain.version); util.initLogging(""); setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); - - setSize(1319, 765); - + + setSize(1142, 662); + contentPane = new JPanel(); contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); setContentPane(contentPane); contentPane.setLayout(null); addWindowListener(new WindowListener()); - JButton btnClose = new JButton(Common.icon_close); btnClose.setFont(new Font("Dialog", Font.PLAIN, 12)); btnClose.setText("Close"); @@ -156,7 +154,7 @@ public void actionPerformed(ActionEvent e) ConfirmExit(); } }); - btnClose.setBounds(911, 657, 150, 38); + btnClose.setBounds(863, 586, 150, 38); contentPane.add(btnClose); btnStart = new JButton(Common.icon_ok); @@ -164,7 +162,7 @@ public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) { - Common.smw.StartMiddleware(); + Common.smw.runMaps(); if (Common.smw.cfg.getMapDirectoryErrorCount() > 0) { String errorMessage = ""; @@ -176,15 +174,16 @@ public void actionPerformed(ActionEvent e) JOptionPane.showMessageDialog(frame, errorMessage, "Map Errors", JOptionPane.ERROR_MESSAGE); - } else + } + else { btnStart.setEnabled(false); btnStop.setEnabled(true); - lblStatus.setText("Running"); - label_NoOfMaps.setText(String.valueOf(Common.smw.cfg.getMaps().size())); + populateList(""); btnClose.setEnabled(false); - progressBarInterface.setBackground(new Color(0, 128, 0)); + lblStatus.setBackground(new Color(0, 128, 0)); + lblStatus.setText("Running"); } } }); @@ -193,41 +192,36 @@ public void actionPerformed(ActionEvent e) btnStart.setText("Start"); btnStart.setSelectedIcon(Common.icon_cancel); btnStart.setOpaque(true); - btnStart.setBounds(261, 657, 150, 38); + btnStart.setBounds(213, 586, 150, 38); contentPane.add(btnStart); - - panelStatus.setBorder(new BevelBorder(BevelBorder.LOWERED, null, null, null, null)); - panelStatus.setBounds(0, 707, 1320, 30); - contentPane.add(panelStatus); - panelStatus.setLayout(null); - - lblStatus.setFont(new Font("Dialog", Font.PLAIN, 12)); - lblStatus.setBounds(4, 0, 1320, 25); + + lblStatus.setFont(new Font("Dialog", Font.BOLD, 12)); lblStatus.setHorizontalAlignment(SwingConstants.LEFT); - panelStatus.add(lblStatus); - - progressBarInterface.setForeground(new Color(0, 128, 0)); - progressBarInterface.setBounds(151, 15, 15, 15); - progressBarInterface.setPreferredSize(new Dimension(40, 40)); - progressBarInterface.setBackground(Color.RED); - contentPane.add(progressBarInterface); - lblInterfaceStatus.setFont(new Font("Dialog", Font.PLAIN, 12)); + lblStatus.setForeground(Color.BLACK); + lblStatus.setBounds(151, 12, 131, 22); + lblStatus.setPreferredSize(new Dimension(40, 40)); + lblStatus.setBackground(new Color (238,238,238)); + lblStatus.setOpaque(true); + lblStatus.setText("Idle"); + + contentPane.add(lblStatus); + lblInterfaceStatus.setFont(new Font("Dialog", Font.BOLD, 12)); lblInterfaceStatus.setHorizontalAlignment(SwingConstants.TRAILING); lblInterfaceStatus.setBounds(12, 12, 131, 22); contentPane.add(lblInterfaceStatus); JLabel lblNumberOfMaps = new JLabel("Number of Maps :"); - lblNumberOfMaps.setFont(new Font("Dialog", Font.PLAIN, 12)); + lblNumberOfMaps.setFont(new Font("Dialog", Font.BOLD, 12)); lblNumberOfMaps.setHorizontalAlignment(SwingConstants.TRAILING); - lblNumberOfMaps.setBounds(181, 12, 131, 22); + lblNumberOfMaps.setBounds(305, 12, 131, 22); contentPane.add(lblNumberOfMaps); - label_NoOfMaps.setBounds(319, 12, 60, 22); + label_NoOfMaps.setBounds(443, 12, 60, 22); contentPane.add(label_NoOfMaps); JScrollPane scrollPaneMaps = new JScrollPane(); - scrollPaneMaps.setBounds(0, 65, 1313, 580); + scrollPaneMaps.setBounds(0, 80, 1141, 503); contentPane.add(scrollPaneMaps); listMaps.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); @@ -236,14 +230,21 @@ public void actionPerformed(ActionEvent e) JButton buttonHelp = new JButton((Icon) null); buttonHelp.setFont(new Font("Dialog", Font.PLAIN, 12)); buttonHelp.setText("Help"); - buttonHelp.setBounds(749, 657, 150, 38); + buttonHelp.setBounds(701, 586, 150, 38); contentPane.add(buttonHelp); - JLabel lblIdDescriptionType = new JLabel(" Map Id Description Input Output(s) In Out Input Path"); - lblIdDescriptionType.setForeground(Color.BLUE); - lblIdDescriptionType.setFont(new Font("Courier New", Font.PLAIN, 12)); - lblIdDescriptionType.setBounds(0, 46, 1300, 22); + JLabel lblIdDescriptionType_1 = new JLabel(" Map Map Connector Connector Path(s)"); + JLabel lblIdDescriptionType = new JLabel("Map Id Description In Out Type Count Input / Output"); + lblIdDescriptionType.setForeground(Color.BLACK); + lblIdDescriptionType.setFont(new Font("Courier New", Font.BOLD, 12)); + lblIdDescriptionType.setBounds(0, 58, 1300, 22); contentPane.add(lblIdDescriptionType); + + + lblIdDescriptionType_1.setForeground(Color.BLACK); + lblIdDescriptionType_1.setFont(new Font("Courier New", Font.BOLD, 12)); + lblIdDescriptionType_1.setBounds(0, 42, 1300, 22); + contentPane.add(lblIdDescriptionType_1); JButton btnRefresh = new JButton((Icon) null); btnRefresh.addActionListener(new ActionListener() @@ -255,7 +256,7 @@ public void actionPerformed(ActionEvent e) }); btnRefresh.setText("Refresh"); btnRefresh.setFont(new Font("Dialog", Font.PLAIN, 12)); - btnRefresh.setBounds(587, 657, 150, 38); + btnRefresh.setBounds(539, 586, 150, 38); contentPane.add(btnRefresh); btnStop = new JButton(Common.icon_cancel); @@ -264,13 +265,13 @@ public void actionPerformed(ActionEvent e) public void actionPerformed(ActionEvent e) { populateList(""); - Common.smw.StopMiddleware(); + Common.smw.stopMaps(); btnStart.setEnabled(true); btnStop.setEnabled(false); - lblStatus.setText("Stopped"); btnClose.setEnabled(true); - progressBarInterface.setBackground(Color.RED); + lblStatus.setBackground(Color.RED); + lblStatus.setText("Stopped"); } }); btnStop.setEnabled(false); @@ -278,7 +279,13 @@ public void actionPerformed(ActionEvent e) btnStop.setOpaque(true); btnStop.setMnemonic(KeyEvent.VK_ENTER); btnStop.setFont(new Font("Dialog", Font.PLAIN, 12)); - btnStop.setBounds(423, 657, 150, 38); + btnStop.setBounds(375, 586, 150, 38); contentPane.add(btnStop); + + Common.smw.init(); + Common.smw.loadMaps(); + + populateList(""); + } } diff --git a/b6Middleware/src/com/commander4j/mw/StartMain.java b/b6Middleware/src/com/commander4j/mw/StartMain.java index ea7ecff..0c0c938 100644 --- a/b6Middleware/src/com/commander4j/mw/StartMain.java +++ b/b6Middleware/src/com/commander4j/mw/StartMain.java @@ -16,7 +16,7 @@ public class StartMain Logger logger = org.apache.logging.log4j.LogManager.getLogger((StartMain.class)); public MiddlewareConfig cfg; - public static String version = "5.25"; + public static String version = "5.31"; Boolean running = false; LogArchiveThread archiveLog; StatusThread statusthread; @@ -28,26 +28,40 @@ public Boolean isRunning() return running; } - public Boolean StartMiddleware() + public Boolean init() { Boolean result = true; - - logger.debug("Application starting"); + + logger.debug("Application Initialisation"); + util.initLogging(""); - + logger.debug("*************************"); logger.debug("** STARTING **"); logger.debug("*************************"); - + return result; + } + + public Boolean loadMaps() + { + Boolean result = true; + cfg = new MiddlewareConfig(); cfg.loadMaps(System.getProperty("user.dir") + File.separator + "xml" + File.separator + "config" + File.separator + "config.xml"); - + logger.debug("*************************"); logger.debug("** MAPS LOADED **"); logger.debug("*************************"); - + + return result; + } + + public Boolean runMaps() + { + Boolean result = true; + if ((cfg.getMapDirectoryErrorCount() == 0) || (Common.runMode.equals("Service"))) { @@ -88,11 +102,11 @@ public Boolean StartMiddleware() Common.emailqueue.addToQueue(true,"Monitor", "Error Starting ["+Common.configName+"] "+StartMain.version+" on "+ util.getClientName(), "Errors :-\n\n"+errorMsg, ""); result = false; } - - return result; + + return result; } - - public Boolean StopMiddleware() + + public Boolean stopMaps() { Boolean result = true; diff --git a/b6Middleware/src/com/commander4j/mw/StartService.java b/b6Middleware/src/com/commander4j/mw/StartService.java index fa95f8d..ccd0cbb 100644 --- a/b6Middleware/src/com/commander4j/mw/StartService.java +++ b/b6Middleware/src/com/commander4j/mw/StartService.java @@ -17,11 +17,14 @@ public StartService() public Integer start(String[] args) { + Common.smw.init(); + Common.smw.loadMaps(); + Integer result = 0; AddShutdownHookSample sample = new AddShutdownHookSample(); sample.attachShutDownHook(); - if (Common.smw.StartMiddleware()) + if (Common.smw.runMaps()) { while (shutdown.equals(false)) @@ -30,7 +33,6 @@ public Integer start(String[] args) { JWait.oneSec(); } - } } @@ -40,7 +42,9 @@ public Integer start(String[] args) public static void main(String[] args) { Common.sservice = new StartService(); + Common.sservice.start(args); + System.exit(0); } @@ -48,7 +52,9 @@ public int stop(int exitCode) { shutdown = true; - Common.smw.StopMiddleware(); + + Common.smw.stopMaps(); + return exitCode; } @@ -65,7 +71,7 @@ public void run() logger.info("Waiting for threads to stop."); - Common.smw.StopMiddleware(); + Common.smw.stopMaps(); logger.info("All threads have stopped.");; }