diff --git a/tools/AccountSynchronizer/accountSynchronizer/manifest.txt b/tools/AccountSynchronizer/accountSynchronizer/manifest.txt index 702c798c8715f4c1fc7dc54dd7ac0f11ee8b68b9..edfc2f64aabe2362aeea98f9189ca6c7253ee845 100644 --- a/tools/AccountSynchronizer/accountSynchronizer/manifest.txt +++ b/tools/AccountSynchronizer/accountSynchronizer/manifest.txt @@ -1,2 +1,3 @@ Main-Class: gov.anl.aps.dm.sync.Synchronizer -Class-Path: ../../lib/ojdbc7.jar ../../lib/postgresql-9.4-1201.jdbc4.jar ../../lib/unboundid-ldapsdk-me.jar ../resources +Class-Path: . ../../lib/postgresql-9.4-1201.jdbc4.jar ../../lib/unboundid-ldapsdk-me.jar + diff --git a/tools/AccountSynchronizer/accountSynchronizer/src/gov/anl/aps/dm/sync/Synchronizer.java b/tools/AccountSynchronizer/accountSynchronizer/src/gov/anl/aps/dm/sync/Synchronizer.java index 4d9ef33223be3de6ba8f5e945d17f64d298e6e5f..f9525559c632523ca74fdba4d7aa382ca3999aa7 100644 --- a/tools/AccountSynchronizer/accountSynchronizer/src/gov/anl/aps/dm/sync/Synchronizer.java +++ b/tools/AccountSynchronizer/accountSynchronizer/src/gov/anl/aps/dm/sync/Synchronizer.java @@ -2,6 +2,7 @@ package gov.anl.aps.dm.sync; import java.io.IOException; import java.io.InputStream; +import java.io.FileInputStream; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Date; @@ -11,11 +12,9 @@ import java.util.logging.Level; import java.util.logging.Logger; public class Synchronizer { -// private final LdapConn lConnection = new LdapConn(); private OracleConnection oConnection; private PsqlConnection pConnection; private final Properties config = new Properties(); -// private final String configFile = "config.properties"; private final Properties tableRows = new Properties(); private final String oracleTable = "oracleTable.properties"; private FileHandler fileHandler; @@ -33,7 +32,13 @@ public class Synchronizer { } private void loadProperties(String configFile) { - InputStream configInputStream = getClass().getClassLoader().getResourceAsStream(configFile); + InputStream configInputStream = null; + try { + configInputStream = new FileInputStream(configFile); + } catch (Exception e) { + e.printStackTrace(); + } + if (configInputStream != null) { try { this.config.load(configInputStream); @@ -43,7 +48,7 @@ public class Synchronizer { System.exit(-1); } } else { - initDefaultLogger(); + initDefaultLogger(); logger.log(Level.SEVERE, "can't find configuration file"); System.exit(-1); } diff --git a/tools/AccountSynchronizer/lib/ojdbc7.jar b/tools/AccountSynchronizer/lib/ojdbc7.jar deleted file mode 100755 index fd38a6c4a5087be6da928776b920d6b9fbe70454..0000000000000000000000000000000000000000 Binary files a/tools/AccountSynchronizer/lib/ojdbc7.jar and /dev/null differ