From 7905cfe906f8b43060b51dd71399b2a1c6e95ebf Mon Sep 17 00:00:00 2001 From: Jeremy Bae Date: Thu, 2 Feb 2017 12:48:29 +0900 Subject: [PATCH 1/2] Set default to MySQL --- .../src/main/resources/jdbc.properties | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/threadfix-main/src/main/resources/jdbc.properties b/threadfix-main/src/main/resources/jdbc.properties index 1f8901a496..0348d7f3a4 100644 --- a/threadfix-main/src/main/resources/jdbc.properties +++ b/threadfix-main/src/main/resources/jdbc.properties @@ -2,21 +2,21 @@ # that are referenced in /src/main/resources/applicationContext-hibernate.xml. #HSQLDB -jdbc.driverClassName=org.hsqldb.jdbcDriver -jdbc.url=jdbc:hsqldb:database/threadfix -jdbc.username=sa -jdbc.password= -hibernate.dialect=org.hibernate.dialect.HSQLDialect -hibernate.hbm2ddl.auto=update - -#MYSQL -#jdbc.driverClassName=com.mysql.jdbc.Driver -#jdbc.url=jdbc:mysql://localhost:3306/threadfix?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&jdbcCompliantTruncation=false&useSSL=false -#jdbc.username=root +#jdbc.driverClassName=org.hsqldb.jdbcDriver +#jdbc.url=jdbc:hsqldb:database/threadfix +#jdbc.username=sa #jdbc.password= -#hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +#hibernate.dialect=org.hibernate.dialect.HSQLDialect #hibernate.hbm2ddl.auto=update +#MYSQL +jdbc.driverClassName=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://localhost:3307/threadfix?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&jdbcCompliantTruncation=false&useSSL=false +jdbc.username=threadfix +jdbc.password=tfpass +hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +hibernate.hbm2ddl.auto=update + # SQL Server (Enterprise only) #jdbc.driverClassName=net.sourceforge.jtds.jdbc.Driver #jdbc.url=jdbc:jtds:sqlserver://sqlserver.address:1433/threadfix;integratedSecurity=false From cf0c114f59c01d219935c5a1feccea3005b22f19 Mon Sep 17 00:00:00 2001 From: Jeremy Bae Date: Thu, 2 Feb 2017 13:30:10 +0900 Subject: [PATCH 2/2] Fix a typo --- threadfix-main/src/main/resources/jdbc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadfix-main/src/main/resources/jdbc.properties b/threadfix-main/src/main/resources/jdbc.properties index 0348d7f3a4..9812d40cab 100644 --- a/threadfix-main/src/main/resources/jdbc.properties +++ b/threadfix-main/src/main/resources/jdbc.properties @@ -11,7 +11,7 @@ #MYSQL jdbc.driverClassName=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3307/threadfix?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&jdbcCompliantTruncation=false&useSSL=false +jdbc.url=jdbc:mysql://localhost:3306/threadfix?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&jdbcCompliantTruncation=false&useSSL=false jdbc.username=threadfix jdbc.password=tfpass hibernate.dialect=org.hibernate.dialect.MySQL5Dialect