Skip to content
This repository was archived by the owner on Jun 17, 2020. It is now read-only.

Commit dfb28bb

Browse files
committed
Merge pull request #118 from CloudCycle2/revert-114-111
Revert "switched from mysql to sqlite, refs #111"
2 parents cbdb2dd + 626cd08 commit dfb28bb

File tree

4 files changed

+11
-171
lines changed

4 files changed

+11
-171
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,3 @@ idea/
3333
log/
3434
target/*
3535
/target
36-
37-
# sqlite
38-
*.db

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
<jersey-version>1.8</jersey-version>
1010
</properties>
1111
<dependencies>
12-
<dependency>
13-
<groupId>org.xerial</groupId>
14-
<artifactId>sqlite-jdbc</artifactId>
15-
<version>3.8.7</version>
16-
</dependency>
1712
<dependency>
1813
<groupId>org.freemarker</groupId>
1914
<artifactId>freemarker</artifactId>
@@ -56,6 +51,11 @@
5651
<artifactId>hibernate-core</artifactId>
5752
<version>4.3.7.Final</version>
5853
</dependency>
54+
<dependency>
55+
<groupId>mysql</groupId>
56+
<artifactId>mysql-connector-java</artifactId>
57+
<version>5.1.34</version>
58+
</dependency>
5959
<dependency>
6060
<groupId>org.apache.logging.log4j</groupId>
6161
<artifactId>log4j-web</artifactId>

src/main/java/org/hibernate/dialect/SQLiteDialect.java

Lines changed: 0 additions & 157 deletions
This file was deleted.

src/main/resources/hibernate.cfg.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
55
<hibernate-configuration>
66
<session-factory>
7-
<!-- SQL dialect -->
8-
<property name="dialect">org.hibernate.dialect.SQLiteDialect</property>
9-
10-
<property name="connection.driver_class">org.sqlite.JDBC</property>
11-
<property name="connection.url">jdbc:sqlite:src/main/resources/csarrepo.db</property>
12-
<property name="connection.username"></property>
7+
<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
8+
<property name="connection.url">jdbc:mysql://localhost/testrepo?useTimezone=true&amp;serverTimezone=UTC</property>
9+
<property name="connection.username">root</property>
1310
<property name="connection.password"></property>
1411

12+
<!-- SQL dialect -->
13+
<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
14+
1515
<!-- Enable Hibernate's automatic session context management -->
1616
<property name="current_session_context_class">thread</property>
1717
<property name="hibernate.hbm2ddl.auto">update</property>

0 commit comments

Comments
 (0)