From 1babb47b247667c542a25d547b59b44dc71732e8 Mon Sep 17 00:00:00 2001
From: Miguel Reboiro Jato <mrjato@uvigo.es>
Date: Mon, 28 Oct 2024 18:48:58 +0100
Subject: [PATCH] Fixes database connection error caused by driver's JAR name

Persistence context creation was failing when following the manual
deployment instruction due to an error in the name of the driver's
JAR.
---
 README.md                                                 | 2 +-
 additional-material/wildfly/v10.1.0/standalone.xml        | 2 +-
 additional-material/wildfly/v8.2.1/standalone.xml         | 2 +-
 .../test/resources-wildfly-embedded-mysql/standalone.xml  | 2 +-
 pom.xml                                                   | 8 ++++----
 .../test/resources-wildfly-embedded-mysql/standalone.xml  | 2 +-
 .../test/resources-wildfly-embedded-mysql/standalone.xml  | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index c8953e4..6c98d54 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ There are several ways to add a datasource to a WildFly server. We are going to
 ```xml
 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
     <connection-url>jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid</connection-url>
-    <driver>mysql-connector-java-8.1.0.jar</driver>
+    <driver>mysql-connector-j-8.1.0.jar</driver>
     <security>
         <user-name>xcs</user-name>
         <password>xcs</password>
diff --git a/additional-material/wildfly/v10.1.0/standalone.xml b/additional-material/wildfly/v10.1.0/standalone.xml
index e200694..76e3979 100644
--- a/additional-material/wildfly/v10.1.0/standalone.xml
+++ b/additional-material/wildfly/v10.1.0/standalone.xml
@@ -151,7 +151,7 @@
                 </datasource>
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid</connection-url>
-                    <driver>mysql-connector-java-8.0.21.jar</driver>
+                    <driver>mysql-connector-j-8.0.21.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>
diff --git a/additional-material/wildfly/v8.2.1/standalone.xml b/additional-material/wildfly/v8.2.1/standalone.xml
index a974e69..cd8d902 100644
--- a/additional-material/wildfly/v8.2.1/standalone.xml
+++ b/additional-material/wildfly/v8.2.1/standalone.xml
@@ -154,7 +154,7 @@
                 </datasource>
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid</connection-url>
-                    <driver>mysql-connector-java-8.0.21.jar</driver>
+                    <driver>mysql-connector-j-8.0.21.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>
diff --git a/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml b/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml
index d2ee02f..c186112 100644
--- a/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml
+++ b/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml
@@ -155,7 +155,7 @@
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcssampletest</connection-url>
                     <driver-class>com.mysql.jdbc.Driver</driver-class>
-                    <driver>mysql-connector-java-${mysql.version}.jar</driver>
+                    <driver>mysql-connector-j-${mysql.version}.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>
diff --git a/pom.xml b/pom.xml
index badb15b..5bc59e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -619,7 +619,7 @@
 											<type>jar</type>
 											<overWrite>false</overWrite>
 											<outputDirectory>${project.build.directory}</outputDirectory>
-											<destFileName>mysql-connector-java-${mysql.connector.java.version}.jar</destFileName>
+											<destFileName>mysql-connector-j-${mysql.connector.java.version}.jar</destFileName>
 										</artifactItem>
 									</artifactItems>
 								</configuration>
@@ -720,7 +720,7 @@
 											<type>jar</type>
 											<overWrite>false</overWrite>
 											<outputDirectory>${project.build.directory}</outputDirectory>
-											<destFileName>mysql-connector-java-${mysql.connector.java.version}.jar</destFileName>
+											<destFileName>mysql-connector-j-${mysql.connector.java.version}.jar</destFileName>
 										</artifactItem>
 									</artifactItems>
 								</configuration>
@@ -757,9 +757,9 @@
 							<before-deployment>
 								<batch />
 								<commands>
-									<command>deploy ${project.build.directory}/mysql-connector-java-${mysql.connector.java.version}.jar</command>
+									<command>deploy ${project.build.directory}/mysql-connector-j-${mysql.connector.java.version}.jar</command>
 									<command>data-source add --jndi-name=java:jboss/datasources/xcs --name=xcs-sample --jta=true --use-ccm=true
-										--connection-url=jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid --driver-name=mysql-connector-java-${mysql.connector.java.version}.jar
+										--connection-url=jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid --driver-name=mysql-connector-j-${mysql.connector.java.version}.jar
 										--user-name=xcs --password=xcs</command>
 									<command>/core-service=management/security-realm=RemotingRealm:add</command>
 									<command>/core-service=management/security-realm=RemotingRealm/authentication=jaas:add(name="AppRealmLoopThrough")</command>
diff --git a/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml b/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml
index d2ee02f..c186112 100644
--- a/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml
+++ b/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml
@@ -155,7 +155,7 @@
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcssampletest</connection-url>
                     <driver-class>com.mysql.jdbc.Driver</driver-class>
-                    <driver>mysql-connector-java-${mysql.version}.jar</driver>
+                    <driver>mysql-connector-j-${mysql.version}.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>
diff --git a/service/src/test/resources-wildfly-embedded-mysql/standalone.xml b/service/src/test/resources-wildfly-embedded-mysql/standalone.xml
index d2ee02f..c186112 100644
--- a/service/src/test/resources-wildfly-embedded-mysql/standalone.xml
+++ b/service/src/test/resources-wildfly-embedded-mysql/standalone.xml
@@ -155,7 +155,7 @@
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcssampletest</connection-url>
                     <driver-class>com.mysql.jdbc.Driver</driver-class>
-                    <driver>mysql-connector-java-${mysql.version}.jar</driver>
+                    <driver>mysql-connector-j-${mysql.version}.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>
-- 
2.18.1