Update to install4j build config

C4J · Jun 16, 2024 · cadfd47 · cadfd47
1 parent b588d0d
commit cadfd47
Show file tree

Hide file tree

Showing 8 changed files with 179 additions and 87 deletions.
diff --git a/b6Middleware/b6middleware.install4j b/b6Middleware/b6middleware.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.8" transformSequenceNumber="10">
   <directoryPresets config="./samples/advanced" />
-  <application name="Commander4j Middleware" applicationId="1915-8055-3520-8512" mediaDir="../../../Distribution/java17/b6middleware4j" compression="9" shortName="c4jMiddleware" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="5.25" allPathsRelative="true" macVolumeId="ebde9226275d23ed" javaMinVersion="17" javaMaxVersion="17">
+  <application name="Commander4j Middleware" applicationId="1915-8055-3520-8512" mediaDir="../../../Distribution/java17/b6middleware4j" compression="9" shortName="c4jMiddleware" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="5.26" allPathsRelative="true" macVolumeId="ebde9226275d23ed" javaMinVersion="17" javaMaxVersion="17">
     <languages skipLanguageSelection="true">
       <additionalLanguages>
         <language id="da" />
@@ -646,29 +646,43 @@ return console.askYesNo(message, true);
     </styles>
   </installerGui>
   <mediaSets>
-    <macosFolder name="Mac OS X Folder (with JRE)" id="86" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}${compiler:sys.withJre}" architecture="universal">
-      <jreBundle usePack200="false" includedJre="macosx-amd64-1.8.0_202">
+    <windows name="Windows 64bit (with JRE)" id="88" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}${compiler:sys.withJre}" customInstallBaseDir="C:\" architecture="64">
+      <jreBundle usePack200="false" includedJre="windows-amd64-1.8.0_202">
         <modules>
           <defaultModules set="all" />
         </modules>
       </jreBundle>
-    </macosFolder>
-    <windows name="Windows 64bit (with JRE)" id="88" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}${compiler:sys.withJre}" customInstallBaseDir="C:\" architecture="64">
-      <jreBundle usePack200="false" includedJre="windows-amd64-1.8.0_202">
+    </windows>
+    <windows name="Windows 32bit (with JRE)" id="89" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}${compiler:sys.withJre}" customInstallBaseDir="C:\" architecture="32">
+      <jreBundle usePack200="false" includedJre="windows-x86-1.8.0_202">
         <modules>
           <defaultModules set="all" />
         </modules>
       </jreBundle>
     </windows>
-    <windows name="Windows 32bit (with JRE)" id="89" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}${compiler:sys.withJre}" customInstallBaseDir="C:\" architecture="32">
-      <jreBundle usePack200="false" includedJre="windows-x86-1.8.0_202">
+    <windows name="Windows arm64 (with JRE)" id="734" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}${compiler:sys.withJre}" customInstallBaseDir="C:\" architecture="arm64">
+      <jreBundle usePack200="false" includedJre="windows-amd64-1.8.0_202">
         <modules>
           <defaultModules set="all" />
         </modules>
       </jreBundle>
     </windows>
-    <unixInstaller name="Unix Installer" id="90" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}${compiler:sys.withJre}">
+    <unixInstaller name="Linux Installer" id="90" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_linux${compiler:sys.withJre}">
       <jreBundle jreBundleSource="none" />
     </unixInstaller>
+    <macosFolder name="Mac OS X Folder intel (with JRE)" id="86" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_intel_mac${compiler:sys.withJre}">
+      <jreBundle usePack200="false" includedJre="macosx-amd64-1.8.0_202">
+        <modules>
+          <defaultModules set="all" />
+        </modules>
+      </jreBundle>
+    </macosFolder>
+    <macosFolder name="Mac OS X Folder arm (with JRE)" id="737" mediaFileName="${compiler:sys.shortName}_${compiler:sys.version}_silicon_mac${compiler:sys.withJre}" architecture="aarch64">
+      <jreBundle usePack200="false" includedJre="macosx-amd64-1.8.0_202">
+        <modules>
+          <defaultModules set="all" />
+        </modules>
+      </jreBundle>
+    </macosFolder>
   </mediaSets>
 </install4j>
diff --git a/b6Middleware/c4jMiddleware.jar b/b6Middleware/c4jMiddleware.jar
diff --git 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
@@ -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
@@ -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 + "<br><font color='red'>" +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 = "<html><font color='blue'>"+
+						util.padString(getId(), true, 7, " ") + 
+						"  " + 
+						util.padString(getDescription(), true, 35, " ") + 
+						"<font color='green'>"+
+						util.padString(getInboundMapMessageCount().toString(), false, 8, " ") + 
+						" " + "<font color='red'>" + 
+						util.padString(getOutboundMapMessageCount().toString(), false, 8, " ") + 
+						"         "+"<font color='green'>"+
+						util.padString(getInboundInterface().getType(), true, 10, " ") + 
+						"   " + 
+						util.padString(getInboundInterface().connector.getInboundConnectorMessageCount().toString(),true,5," ")+
+						"   " + 
+						getInboundInterface().getInputPath()+outboundPathList+"</html>";
+
+		result = result.replace(" ", "&nbsp;");
+
+		return result;
 	}
 
 	public void setId(String ID)