2.6.6 final I hope

gflewis · Dec 16, 2017 · bca5545 · bca5545
1 parent d5bbe03
commit bca5545
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -314,7 +314,7 @@
               </transformers>
               <artifactSet>
                 <includes>
-                  <include>ojdbc6:ojdbc6</include>
+                  <include>com.oracle:*</include>
                   <include>org.apache.commons:*</include>
                   <include>commons-*:*</include>
                   <include>com.rabbitmq:*</include>

diff --git a/src/main/java/servicenow/common/datamart/ResourceManager.java b/src/main/java/servicenow/common/datamart/ResourceManager.java
@@ -123,6 +123,11 @@ static Connection getNewConnection() {
 
 	static Connection getNewConnection(DatamartConfiguration config) {
 		try {
+			String driver = config.getString("driver",  "");
+			if (driver.length() > 0) {
+				logger.info("driver=" + driver);
+				Class.forName(driver);
+			}
 			String dburl  = config.getRequiredString("url");
 			String dbuser = config.getRequiredString("username");
 			String schema = config.getString("schema");
@@ -133,6 +138,8 @@ static Connection getNewConnection(DatamartConfiguration config) {
 		}
 		catch (SQLException e) {
 			throw new ResourceException(e);
+		} catch (ClassNotFoundException e) {
+			throw new ResourceException(e);
 		}
 	}
 

diff --git a/src/main/java/servicenow/common/datamart/SqlGenerator.java b/src/main/java/servicenow/common/datamart/SqlGenerator.java
@@ -1,4 +1,4 @@
-package servicenow.common.datamart;
+	package servicenow.common.datamart;
 
 import java.io.*;
 import java.util.*;
@@ -46,11 +46,19 @@ public class SqlGenerator {
 	public SqlGenerator(DatamartConfiguration config, DatabaseWriter database)  
 			throws ResourceException, SQLException {
 		InputStream sqlConfigStream;
-		sqlConfigStream = 
-			ClassLoader.getSystemResourceAsStream(
-				config.getString("templates",  "sqltemplates.xml"));
-		if (sqlConfigStream == null)
-			throw new ResourceException("Unable to locate resource: sqltemplates.xml");
+		String templatesName = config.getString("templates", "");
+		if (templatesName.length() > 0)
+			try {
+				sqlConfigStream = new FileInputStream(templatesName);
+			}
+			catch (IOException e) {
+				throw new ResourceException(e);
+			}
+		else { 
+			sqlConfigStream = ClassLoader.getSystemResourceAsStream("sqltemplates.xml");			
+			if (sqlConfigStream == null)
+				throw new ResourceException("Unable to locate resource: sqltemplates.xml");
+			}
 		SAXBuilder xmlbuilder = new SAXBuilder();
 		try {
 			xmldocument = xmlbuilder.build(sqlConfigStream);

diff --git a/src/main/java/servicenow/common/soap/ParallelTableReader.java b/src/main/java/servicenow/common/soap/ParallelTableReader.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.util.NoSuchElementException;
-import java.util.concurrent.Future;
 
+@Deprecated
 public class ParallelTableReader extends TableReader {
 
 	KeyList keys;

diff --git a/src/main/java/servicenow/common/soap/Table.java b/src/main/java/servicenow/common/soap/Table.java
@@ -755,6 +755,7 @@ public PetitTableReader petitReader() throws IOException {
 		return new PetitTableReader(this);
 	}
 
+	@Deprecated
 	public ParallelTableReader parallelReader(QueryFilter query) 
 			throws InterruptedException, IOException {
 		return new ParallelTableReader(this, query);