Skip to content

Commit 5809987

Browse files
committed
Merge pull request alibaba#7 from 88250/master
manager 编译问题修复
2 parents d79d8ec + 15913f9 commit 5809987

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/manager/target/
2+
/driver/target/
3+
/server/target/

driver/src/main/java/com/alibaba/cobar/jdbc/Driver.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,19 @@
2121
import java.util.Properties;
2222

2323
import com.mysql.jdbc.NonRegisteringDriver;
24+
import java.sql.SQLFeatureNotSupportedException;
25+
import java.util.logging.Logger;
2426

2527
/**
2628
* 在使用集群时提供负载均衡的功能,其他情况和MySQLDriver一样。
27-
*
29+
*
2830
* <pre>
2931
* 使用方法:
3032
* Class.forName("com.alibaba.cobar.jdbc.Driver");
3133
* String url = "jdbc:cobar://host:port/dbname?user=xxx&password=xxx";
3234
* ...
3335
* </pre>
34-
*
36+
*
3537
* @author xianmao.hexm 2012-4-27
3638
*/
3739
public class Driver extends NonRegisteringDriver implements java.sql.Driver {
@@ -51,7 +53,7 @@ public class Driver extends NonRegisteringDriver implements java.sql.Driver {
5153

5254
/**
5355
* Construct a new driver and register it with DriverManager
54-
*
56+
*
5557
* @throws SQLException if a database error occurs.
5658
*/
5759
public Driver() throws SQLException {
@@ -73,4 +75,9 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws
7375
return super.getPropertyInfo(UrlProvider.getMySQLUrl(url), info);
7476
}
7577

78+
@Override
79+
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
80+
throw new SQLFeatureNotSupportedException("Not supported yet.");
81+
}
82+
7683
}

manager/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
<groupId>net.sf.json-lib</groupId>
139139
<artifactId>json-lib</artifactId>
140140
<version>2.2.3</version>
141+
<classifier>jdk15</classifier>
141142
</dependency>
142143
<dependency>
143144
<groupId>xpp3</groupId>

manager/src/main/java/com/alibaba/cobar/manager/mock/SimpleDateSource.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import java.io.PrintWriter;
2020
import java.sql.Connection;
2121
import java.sql.SQLException;
22+
import java.sql.SQLFeatureNotSupportedException;
23+
import java.util.logging.Logger;
2224

2325
import javax.sql.DataSource;
2426

@@ -72,4 +74,9 @@ public Connection getConnection(String username, String password) throws SQLExce
7274
return null;
7375
}
7476

77+
@Override
78+
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
79+
throw new SQLFeatureNotSupportedException("Not supported yet.");
80+
}
81+
7582
}

0 commit comments

Comments
 (0)