diff --git a/tools/AccountSynchronizer/accountSynchronizer/resources/config.properties b/tools/AccountSynchronizer/accountSynchronizer/resources/config.properties index ea71d873d99beb80d6a53914daf92be0966e507d..7e29e8260dd62d0ea1212eb374574e022ad5395d 100644 --- a/tools/AccountSynchronizer/accountSynchronizer/resources/config.properties +++ b/tools/AccountSynchronizer/accountSynchronizer/resources/config.properties @@ -1,38 +1,11 @@ -### log congiguration -log.file = accountSynchronizer%g.log -log.limit = 6000 -log.count = 2 - ### ### Oracle database settings ### oracle.database.connection = jdbc:oracle:thin:@ra.aps.anl.gov:1527:aps1 -oracle.database.username = glob_conn -### oracle.database.password = +#oracle.database.username = +#oracle.database.password = oracle.database.table = DCC.FL$03_BL_APV_VIEW_V2 -### -### Postgresql database settings -### -dm.database.connection = jdbc:postgresql://127.0.0.1:11136/dm -dm.database.username = dm -### dm.database.password = - -### Connection settings for LDAP -### -# -#ldap.server.address = blacklab.xray.aps.anl.gov -#ldap.server.port = 389 -#ldap.server.username = uid=dmadmin,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov -#ldap.server.password = - -### -### LDAP user account settings -### -#ldap.accounts.baseDN = ou=People, o=aps.anl.gov, dc=aps,dc=anl,dc=gov - -### General account settings -### -# The user name prefix that gets append to every badge number. -user.userid.prefix = d - +#dm.storageServ.connection = http://xstor-devel.xray.aps.anl.gov:22236/dm +dm.storageServ.connection = http://localhost:22236/dm +dm.daqServ.connection = http://localhost:33336/dm diff --git a/tools/AccountSynchronizer/accountSynchronizer/resources/oracleTable.properties b/tools/AccountSynchronizer/accountSynchronizer/resources/oracleTable.properties deleted file mode 100644 index eb47ccb280cf5aa57bab3a0454afca5c7dab7178..0000000000000000000000000000000000000000 --- a/tools/AccountSynchronizer/accountSynchronizer/resources/oracleTable.properties +++ /dev/null @@ -1,13 +0,0 @@ -# To change this license header, choose License Headers in Project Properties. -# To change this template file, choose Tools | Templates -# and open the template in the editor. - -firstName = FIRST_NAME -lastName = LAST_NAME -middleName = MIDDLE_NAME -email = EMAIL -badge = BADGE_NO -password = PWD_HASH_VALUE -notEmployee = IS_USRNOT_ANL_EMP -inactive = INACTIVE -recordUpdate = LAST_CHANGE_DATE diff --git a/tools/ExperimentSynchronizer/install_expSync.sh b/tools/ExperimentSynchronizer/install_expSync.sh index 3f94f1553b22918dfec7247f1d50789d74ce1dd0..060f2659638be8136c445d1fd9a18ecdf44c5d2d 100644 --- a/tools/ExperimentSynchronizer/install_expSync.sh +++ b/tools/ExperimentSynchronizer/install_expSync.sh @@ -13,7 +13,7 @@ EXPSYNC_DIR=ExperimentSynchronizer cd $EXPSYNC_DIR mkdir bin -execute javac -classpath lib/*:resources/* -d bin/ src/gov/anl/dm/esafsync/*.java src/gov/anl/dm/esafsync/serviceconn/*.java +execute javac -classpath lib/*:config/* -d bin/ src/gov/anl/dm/esafsync/*.java src/gov/anl/dm/esafsync/serviceconn/*.java mkdir target execute jar cfm target/ExperimentSynchronizer.jar manifest.txt -C bin/ . diff --git a/tools/ExperimentSynchronizer/run_expSync.sh b/tools/ExperimentSynchronizer/run_expSync.sh index 31b912fea43b6b0a84dfaa974c0f3ffefb2ecf2a..7b575dfcdee38b3a8cb17363a951836b1ea6cce2 100644 --- a/tools/ExperimentSynchronizer/run_expSync.sh +++ b/tools/ExperimentSynchronizer/run_expSync.sh @@ -3,5 +3,5 @@ execute() { eval "$@" } -execute java -jar target/ExperimentSynchronizer.jar resources/config.properties +execute java -jar target/ExperimentSynchronizer.jar config/config.properties