Update mysql jdbc

C4J · Oct 19, 2024 · 3c294ae · 3c294ae
1 parent dfb5a2b
commit 3c294ae
Show file tree

Hide file tree

Showing 43 changed files with 159 additions and 36 deletions.
diff --git a/b6/.classpath b/b6/.classpath
@@ -164,7 +164,7 @@
 	<classpathentry kind="lib" path="lib/avalon-framework-impl-4.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/barcode4j-2.2.3.jar"/>
 	<classpathentry kind="lib" path="lib/commons-cli-1.8.0.jar"/>
-	<classpathentry kind="lib" path="lib/db/mysql-connector-j-9.0.0.jar"/>
+	<classpathentry kind="lib" path="lib/db/mysql-connector-j-9.1.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java 17 JDK">
 		<attributes>
 			<attribute name="module" value="true"/>

diff --git a/b6/MANIFEST.MF b/b6/MANIFEST.MF
@@ -54,7 +54,7 @@ Class-Path: lib/SparseBitSet-1.2.jar
  lib/cups4j-0.7.9.jar 
  lib/curvesapi-1.07.jar 
  lib/db/mssql-jdbc-12.8.0.jre11.jar 
- lib/db/mysql-connector-j-9.0.0.jar 
+ lib/db/mysql-connector-j-9.1.0.jar 
  lib/db/ojdbc11.jar 
  lib/ecj-3.21.0.jar 
  lib/eigenbase-properties-1.1.0.10924.jar 

diff --git a/b6/commander4j.install4j b/b6/commander4j.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.9" transformSequenceNumber="10">
   <directoryPresets config="./images/icons/CMD4j_Icons" />
-  <application name="Commander4j" applicationId="6923-0356-2321-8111" mediaDir="../../../Distribution/java17/b6Commander4j" shrinkRuntime="false" shortName="Commander4j" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="11.07" allPathsRelative="true" macVolumeId="2fff9a9d0dc659ac" javaMinVersion="17" javaMaxVersion="17">
+  <application name="Commander4j" applicationId="6923-0356-2321-8111" mediaDir="../../../Distribution/java17/b6Commander4j" shrinkRuntime="false" shortName="Commander4j" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="11.08" allPathsRelative="true" macVolumeId="2fff9a9d0dc659ac" javaMinVersion="17" javaMaxVersion="17">
     <languages skipLanguageSelection="true">
       <additionalLanguages>
         <language id="nl" />
@@ -13,7 +13,7 @@
         <language id="es" />
       </additionalLanguages>
     </languages>
-    <jreBundles jdkProviderId="Zulu" release="17/17.0.11" />
+    <jreBundles jdkProviderId="Zulu" release="17/17.0.13" />
   </application>
   <files keepModificationTimes="true" missingFilesStrategy="error" globalExcludeSuffixes="dirClean.ok,.DS_Store">
     <mountPoints>

diff --git a/b6/commander4j.jar b/b6/commander4j.jar
diff --git a/b6/lib/db/mysql-connector-j-9.0.0.jar → b6/lib/db/mysql-connector-j-9.1.0.jar b/b6/lib/db/mysql-connector-j-9.0.0.jar → b6/lib/db/mysql-connector-j-9.1.0.jar
diff --git a/b6/src/com/commander4j/app/JVersion.java b/b6/src/com/commander4j/app/JVersion.java
@@ -31,7 +31,7 @@ public class JVersion
 {
 
 	public static String getProgramVersion() {
-		return "11.07";
+		return "11.08";
 	}
 
 	public static Double getProgramVersionValue() {

diff --git a/b6/src/com/commander4j/sys/JDialogDisplayLicense.java b/b6/src/com/commander4j/sys/JDialogDisplayLicense.java
@@ -1,31 +1,27 @@
 package com.commander4j.sys;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
-
-import com.commander4j.db.JDBLanguage;
-import com.commander4j.gui.JButton4j;
-import javax.swing.JScrollPane;
-
+import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
-
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.awt.event.ActionEvent;
-import javax.swing.WindowConstants;
+
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JTextPane;
 import javax.swing.JViewport;
-import java.awt.Color;
-import java.awt.Font;
+import javax.swing.WindowConstants;
+import javax.swing.border.EmptyBorder;
+
+import com.commander4j.db.JDBLanguage;
+import com.commander4j.gui.JButton4j;
 
 public class JDialogDisplayLicense extends JDialog
 {
@@ -43,6 +39,16 @@ public JDialogDisplayLicense(JDialogLicenses lll, JLicenseInfo license)
 		setModalityType(ModalityType.DOCUMENT_MODAL);
 		setTitle(license.getDescription()+ " ("+license.type+")");
 		setBounds(100, 100, 767, 587);
+
+		Dimension screensize = Common.mainForm.getSize();
+		Point parentPos = Common.mainForm.getLocation();
+
+		Dimension formsize = getSize();
+		int leftmargin = ((screensize.width - formsize.width) / 2);
+		int topmargin = ((screensize.height - formsize.height) / 2);
+
+		setLocation(parentPos.x + leftmargin , parentPos.y+ topmargin);
+
 		getContentPane().setLayout(new BorderLayout());
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		getContentPane().add(contentPanel, BorderLayout.CENTER);
@@ -80,9 +86,6 @@ public void actionPerformed(ActionEvent e)
 			getRootPane().setDefaultButton(okButton);
 		}
 
-		Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-		Rectangle window = getBounds();
-		setLocation((screen.width - window.width) / 2, (screen.height - window.height) / 2);
 
 		setResizable(false);
 		setModal(true);

diff --git a/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar
diff --git a/...t/WEB-INF/lib/mysql-connector-j-9.0.0.jar → ...t/WEB-INF/lib/mysql-connector-j-9.1.0.jar b/...t/WEB-INF/lib/mysql-connector-j-9.0.0.jar → ...t/WEB-INF/lib/mysql-connector-j-9.1.0.jar
diff --git a/...android_eb3/WebContent/xml/schema/com.microsoft.sqlserver.jdbc.SQLServerDriver/000196.xml b/...android_eb3/WebContent/xml/schema/com.microsoft.sqlserver.jdbc.SQLServerDriver/000196.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DDL SYSTEM "schema.dtd">
+<DDL>
+
+	<statement>	
+		ALTER TABLE [dbo].[APP_PROCESS_ORDER] ADD [RECIPE_VERSION] varchar(10) DEFAULT ''
+	</statement>
+
+
+</DDL>
diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000196.xml b/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000196.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DDL SYSTEM "schema.dtd">
+<DDL>
+
+	<statement>	
+		ALTER TABLE `APP_PROCESS_ORDER` ADD COLUMN `RECIPE_VERSION` varchar(10) NULL DEFAULT '' AFTER `INSPECTION_ID`
+	</statement>
+
+
+</DDL>
diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000196.xml b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000196.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DDL SYSTEM "schema.dtd">
+<DDL>
+
+	<statement>	
+		ALTER TABLE "APP_PROCESS_ORDER"  ADD ("RECIPE_VERSION" VARCHAR2(10) DEFAULT '')
+	</statement>
+
+
+</DDL>
diff --git a/...b_t10_android_eb3/WebContent/xml/sql/sql.com.microsoft.sqlserver.jdbc.SQLServerDriver.xml b/...b_t10_android_eb3/WebContent/xml/sql/sql.com.microsoft.sqlserver.jdbc.SQLServerDriver.xml
@@ -637,7 +637,7 @@
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.update</id>
-			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=? where process_order=?</text>
+			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=?,recipe_version=? where process_order=?</text>
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.selectWithLimit</id>

diff --git a/b6web_t10_android_eb3/WebContent/xml/sql/sql.com.mysql.cj.jdbc.Driver.xml b/b6web_t10_android_eb3/WebContent/xml/sql/sql.com.mysql.cj.jdbc.Driver.xml
@@ -637,7 +637,7 @@
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.update</id>
-			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=? where process_order=?</text>
+			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=?,recipe_version=? where process_order=?</text>
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.selectWithLimit</id>

diff --git a/b6web_t10_android_eb3/WebContent/xml/sql/sql.oracle.jdbc.driver.OracleDriver.xml b/b6web_t10_android_eb3/WebContent/xml/sql/sql.oracle.jdbc.driver.OracleDriver.xml
@@ -637,7 +637,7 @@
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.update</id>
-			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=? where process_order=?</text>
+			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=?,recipe_version=? where process_order=?</text>
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.selectWithLimit</id>

diff --git a/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war b/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war
diff --git a/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar
diff --git a/...t/WEB-INF/lib/mysql-connector-j-9.0.0.jar → ...t/WEB-INF/lib/mysql-connector-j-9.1.0.jar b/...t/WEB-INF/lib/mysql-connector-j-9.0.0.jar → ...t/WEB-INF/lib/mysql-connector-j-9.1.0.jar
diff --git a/...b_t10_react/WebContent/xml/schema/com.microsoft.sqlserver.jdbc.SQLServerDriver/000196.xml b/...b_t10_react/WebContent/xml/schema/com.microsoft.sqlserver.jdbc.SQLServerDriver/000196.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DDL SYSTEM "schema.dtd">
+<DDL>
+
+	<statement>	
+		ALTER TABLE [dbo].[APP_PROCESS_ORDER] ADD [RECIPE_VERSION] varchar(10) DEFAULT ''
+	</statement>
+
+
+</DDL>
diff --git a/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000196.xml b/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000196.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DDL SYSTEM "schema.dtd">
+<DDL>
+
+	<statement>	
+		ALTER TABLE `APP_PROCESS_ORDER` ADD COLUMN `RECIPE_VERSION` varchar(10) NULL DEFAULT '' AFTER `INSPECTION_ID`
+	</statement>
+
+
+</DDL>
diff --git a/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000196.xml b/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000196.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DDL SYSTEM "schema.dtd">
+<DDL>
+
+	<statement>	
+		ALTER TABLE "APP_PROCESS_ORDER"  ADD ("RECIPE_VERSION" VARCHAR2(10) DEFAULT '')
+	</statement>
+
+
+</DDL>
diff --git a/b6web_t10_react/WebContent/xml/sql/sql.com.microsoft.sqlserver.jdbc.SQLServerDriver.xml b/b6web_t10_react/WebContent/xml/sql/sql.com.microsoft.sqlserver.jdbc.SQLServerDriver.xml
@@ -637,7 +637,7 @@
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.update</id>
-			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=? where process_order=?</text>
+			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=?,recipe_version=? where process_order=?</text>
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.selectWithLimit</id>

diff --git a/b6web_t10_react/WebContent/xml/sql/sql.com.mysql.cj.jdbc.Driver.xml b/b6web_t10_react/WebContent/xml/sql/sql.com.mysql.cj.jdbc.Driver.xml
@@ -637,7 +637,7 @@
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.update</id>
-			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=? where process_order=?</text>
+			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=?,recipe_version=? where process_order=?</text>
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.selectWithLimit</id>

diff --git a/b6web_t10_react/WebContent/xml/sql/sql.oracle.jdbc.driver.OracleDriver.xml b/b6web_t10_react/WebContent/xml/sql/sql.oracle.jdbc.driver.OracleDriver.xml
@@ -637,7 +637,7 @@
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.update</id>
-			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=? where process_order=?</text>
+			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=?,recipe_version=? where process_order=?</text>
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.selectWithLimit</id>

diff --git a/b6web_t10_react/dist/b6web_t10_react.war b/b6web_t10_react/dist/b6web_t10_react.war
diff --git a/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar
diff --git a/...t/WEB-INF/lib/mysql-connector-j-9.0.0.jar → ...t/WEB-INF/lib/mysql-connector-j-9.1.0.jar b/...t/WEB-INF/lib/mysql-connector-j-9.0.0.jar → ...t/WEB-INF/lib/mysql-connector-j-9.1.0.jar
diff --git a/...t10_wm_eb18/WebContent/xml/schema/com.microsoft.sqlserver.jdbc.SQLServerDriver/000196.xml b/...t10_wm_eb18/WebContent/xml/schema/com.microsoft.sqlserver.jdbc.SQLServerDriver/000196.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DDL SYSTEM "schema.dtd">
+<DDL>
+
+	<statement>	
+		ALTER TABLE [dbo].[APP_PROCESS_ORDER] ADD [RECIPE_VERSION] varchar(10) DEFAULT ''
+	</statement>
+
+
+</DDL>
diff --git a/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000196.xml b/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000196.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DDL SYSTEM "schema.dtd">
+<DDL>
+
+	<statement>	
+		ALTER TABLE `APP_PROCESS_ORDER` ADD COLUMN `RECIPE_VERSION` varchar(10) NULL DEFAULT '' AFTER `INSPECTION_ID`
+	</statement>
+
+
+</DDL>
diff --git a/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000196.xml b/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000196.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE DDL SYSTEM "schema.dtd">
+<DDL>
+
+	<statement>	
+		ALTER TABLE "APP_PROCESS_ORDER"  ADD ("RECIPE_VERSION" VARCHAR2(10) DEFAULT '')
+	</statement>
+
+
+</DDL>
diff --git a/b6web_t10_wm_eb18/WebContent/xml/sql/sql.com.microsoft.sqlserver.jdbc.SQLServerDriver.xml b/b6web_t10_wm_eb18/WebContent/xml/sql/sql.com.microsoft.sqlserver.jdbc.SQLServerDriver.xml
@@ -637,7 +637,7 @@
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.update</id>
-			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=? where process_order=?</text>
+			<text>update {schema}APP_PROCESS_ORDER set material=?,description=?,status=?,location_id=?,due_date=?,recipe_id=?,required_quantity=?,required_uom=?,default_pallet_status=?,updated=?,required_resource=?,customer_id=?,inspection_id=?,recipe_version=? where process_order=?</text>
 		</statement>
 		<statement>
 			<id>JDBProcessOrder.selectWithLimit</id>