Merge branch 'development'

pom.xml

@@ -104,10 +104,12 @@
 		<version>1.6.4</version>
 	</dependency>
 	<dependency>
-		<groupId>net.sourceforge.jtds</groupId>
-	    <artifactId>jtds</artifactId>
-		<version>1.2.4</version>
-	</dependency>
+			<groupId>net.sourceforge.jtds</groupId>
+			<artifactId>jtds</artifactId>
+			<version>1.2.5</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/lib/jtds-1.2.5.jar</systemPath>
+		</dependency>
 	<dependency>
 		<groupId>xml-apis</groupId>
 		<artifactId>xml-apis</artifactId>
@@ -182,11 +184,6 @@
     	<artifactId>mysql-connector-java</artifactId>
     	<version>5.1.17</version>
     </dependency>
-    <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-      <version>1.3.1</version>
-    </dependency>
     <dependency>
     	<groupId>org.antlr</groupId>
     	<artifactId>antlr</artifactId>

src/main/java/edu/isi/karma/util/AbstractJDBCUtil.java

@@ -56,7 +56,7 @@ public abstract ArrayList<ArrayList<String>> getDataForLimitedRows(DBType dbType
 
 	public abstract ArrayList<String> getListOfTables(Connection conn) throws SQLException, ClassNotFoundException;
 
-	public Connection getConnection(String driver, String connectString) throws SQLException, ClassNotFoundException {
+	protected Connection getConnection(String driver, String connectString) throws SQLException, ClassNotFoundException {
 		Connection localConn = null;
 		Class.forName(driver);
 		localConn = DriverManager.getConnection(connectString);
@@ -92,18 +92,15 @@ protected String getConnectString (String hostname, int portnumber, String usern
 	public ArrayList<String> getListOfTables(DBType dbType, String hostname,
 			int portnumber, String username, String password, String dBorSIDName) 
 			throws SQLException, ClassNotFoundException {
-		String connectString = getConnectString(hostname, portnumber, username, password, dBorSIDName);
-		Connection conn = getConnection(getDriver(), connectString);
-
+		Connection conn = getConnection(hostname, portnumber, username, password, dBorSIDName);
 		return getListOfTables(conn);
 	}
 
 	public ArrayList<ArrayList<String>> getDataForTable(DBType dbType, String hostname,
 			int portnumber, String username, String password, String tableName, String dBorSIDName)
 			throws SQLException, ClassNotFoundException {
-		String connectString = getConnectString(hostname, portnumber, username, password, dBorSIDName);
-		Connection conn = getConnection(getDriver(), connectString);
-
+
+		Connection conn = getConnection(hostname, portnumber, username, password, dBorSIDName);
 		return getDataForTable(conn, tableName);
 	}
 

src/main/java/edu/isi/karma/util/SybaseUtil.java

@@ -2,21 +2,27 @@
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Collections;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class SybaseUtil extends AbstractJDBCUtil {
-
+	private static Logger logger = LoggerFactory
+			.getLogger(SybaseUtil.class);
+
 	static final String DRIVER = 
 			"net.sourceforge.jtds.jdbc.Driver";
 
 	static final String CONNECT_STRING_TEMPLATE = 
-			"jdbc:jtds:sybase://host:port/dbname?user=username&password=pwd";
-		
+			"jdbc:jtds:sybase://host:port/dbname";
+
 
 	@Override
 	protected String getDriver() {
@@ -28,6 +34,27 @@ protected String getConnectStringTemplate() {
 		return CONNECT_STRING_TEMPLATE;
 	}
 
+	public Connection getConnection(String driver, String url, String username, String pwd) throws SQLException, ClassNotFoundException {
+		Connection localConn = null;
+		Class.forName(driver);
+		localConn = DriverManager.getConnection(url, username, pwd);
+		return localConn;
+	}
+
+
+	public Connection getConnection(String hostname,
+			int portnumber, String username, String password, String dBorSIDName)
+			throws SQLException, ClassNotFoundException {
+		String connectString = getConnectStringTemplate();
+		connectString = connectString.replaceAll("host", hostname);
+		connectString = connectString.replaceAll("port", Integer.toString(portnumber));
+		connectString = connectString.replaceAll("dbname", dBorSIDName);
+
+		logger.info("Connect to:"+ connectString);
+		Connection conn = getConnection(getDriver(), connectString, username, password);
+		return conn;
+	}
+
 	@Override
 	public ArrayList<String> getListOfTables(Connection conn) 
 			throws SQLException, ClassNotFoundException {
@@ -45,9 +72,8 @@ public ArrayList<String> getListOfTables(Connection conn)
 	public ArrayList<ArrayList<String>> getDataForLimitedRows(DBType dbType,
 			String hostname, int portnumber, String username, String password,
 			String tableName, String dBorSIDName, int rowCount) throws SQLException, ClassNotFoundException {
-
-		String connectString = getConnectString(hostname, portnumber, username, password, dBorSIDName);
-		Connection conn = getConnection(DRIVER, connectString);
+
+		Connection conn = getConnection(hostname, portnumber, username, password, dBorSIDName);
 		String query = "Select * from " + tableName + " limit " + rowCount;
 
 		Statement s = conn.createStatement();

src/main/webapp/version.jsp

@@ -1 +1 @@
-v1.194
+v1.195