diff --git a/configuration/settings.xml b/configuration/settings.xml deleted file mode 100644 index 48e27008843bf301654294760fdc4ed658dece9e..0000000000000000000000000000000000000000 --- a/configuration/settings.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - <servers> - <server> - <id>os-core</id> - <username>os-core</username> - <!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. --> - <!-- The generated token expires on or before 11/14/2019 --> - <password>${VSTS_FEED_TOKEN}</password> - </server> - </servers> -</settings> \ No newline at end of file diff --git a/provider/indexer-ibm/src/main/resources/application-local.properties b/provider/indexer-ibm/src/main/resources/application-local.properties deleted file mode 100644 index be507a6a09da247fc887841f298e661d255ed897..0000000000000000000000000000000000000000 --- a/provider/indexer-ibm/src/main/resources/application-local.properties +++ /dev/null @@ -1,66 +0,0 @@ -server.servlet.contextPath=/api/indexer/v2/ - -LOG_PREFIX=indexer - -logging.level.org.springframework.web=DEBUG -server.port=8084 -JAVA_HEAP_OPTS=-Xms4096M -Xmx4096M -JAVA_GC_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45 - -DEFAULT_DATA_COUNTRY=US - -AUTHORIZE_API=http://localhost:8080/api/entitlements/v1 -AUTHORIZE_API_KEY=tobeupdated -LEGALTAG_API=http://localhost:8081/api/legal/v1 - -DEPLOYMENT_ENVIRONMENT=CLOUD - -SCHEMA_CACHE_EXPIRATION=60 -INDEX_CACHE_EXPIRATION=60 -ELASTIC_CACHE_EXPIRATION=1440 -CURSOR_CACHE_EXPIRATION=60 -KINDS_CACHE_EXPIRATION=2880 -ATTRIBUTES_CACHE_EXPIRATION=2880 -MAX_CACHE_VALUE_SIZE=1000 -KINDS_REDIS_DATABASE=1 -CRON_INDEX_CLEANUP_THRESHOLD_DAYS=3 -CRON_EMPTY_INDEX_CLEANUP_THRESHOLD_DAYS=7 - -storage_service_url=http://localhost:8082 -STORAGE_SCHEMA_HOST=${storage_service_url}/api/storage/v2/schemas -STORAGE_QUERY_RECORD_HOST=${storage_service_url}/api/storage/v2/query/records -STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=${storage_service_url}/api/storage/v2/query/records:batch -STORAGE_RECORDS_BATCH_SIZE=20 - - -ibm.db.url=https://5be9693e-3324-400a-aadc-59908c132be2-bluemix:fda78cfd89315e9ff2f39cfb9c6cdd52dbd06e385786b523bb918654331176cb@5be9693e-3324-400a-aadc-59908c132be2-bluemix.cloudantnosqldb.appdomain.cloud -## use apikey or user/password -ibm.db.user=5be9693e-3324-400a-aadc-59908c132be2-bluemix -ibm.db.password=fda78cfd89315e9ff2f39cfb9c6cdd52dbd06e385786b523bb918654331176cb -ibm.tenant.db.url=https://5be9693e-3324-400a-aadc-59908c132be2-bluemix:fda78cfd89315e9ff2f39cfb9c6cdd52dbd06e385786b523bb918654331176cb@5be9693e-3324-400a-aadc-59908c132be2-bluemix.cloudantnosqldb.appdomain.cloud -## use apikey or user/password -ibm.tenant.db.user=5be9693e-3324-400a-aadc-59908c132be2-bluemix -ibm.tenant.db.password=fda78cfd89315e9ff2f39cfb9c6cdd52dbd06e385786b523bb918654331176cb -ibm.rabbitmq.uri=amqps://ibm_cloud_6d0f138f_4a92_4e3f_9110_3da1e950e261:fa818ec0e6970db65926f71f8a173052338d1e855cabf305053f1da752c738e3@93691a6a-6a28-4eca-a09e-da33088863e6.blijti4d0v0nkr55oei0.databases.appdomain.cloud:32346 -ibm.cos.endpoint_url=s3.us-south.cloud-object-storage.appdomain.cloud - - - - -ibm.keycloak.endpoint_url=keycloak-host.com -ibm.keycloak.realm=OSDU -ibm.keycloak.client_id=osdu-login -ibm.keycloak.client_secret=REPLACE_ME -ibm.keycloak.username=REPLACE_ME -ibm.keycloak.password=REPLACE_ME -ibm.keycloak.useremail=osdu-user@osdu.opengroup.org - -#Indexer-Queue-header -indexer.queue.key=abcd - -ELASTIC_DATASTORE_KIND=SearchSettings -ELASTIC_DATASTORE_ID=indexer-service - -ELASTIC_HOST=elasticsearch.com -ELASTIC_PORT=443 -ELASTIC_USER_PASSWORD=REPLACE_ME:REPLACE_ME diff --git a/provider/indexer-ibm/src/main/resources/application.properties b/provider/indexer-ibm/src/main/resources/application.properties index 242a77daef41824a0a7d59a4076135893f73d7ce..9a7a16cc4942744aea51f9e54bc4bae855892b8d 100644 --- a/provider/indexer-ibm/src/main/resources/application.properties +++ b/provider/indexer-ibm/src/main/resources/application.properties @@ -43,7 +43,9 @@ ibm.tenant.db.url=${ibm.db.url} ibm.tenant.db.user=${ibm.db.user} ibm.tenant.db.password=${ibm.db.password} -ibm.rabbitmq.uri=REPLACE_ME +amqphub.amqp10jms.remote-url=REPLACE_ME +amqphub.amqp10jms.username=admin +amqphub.amqp10jms.password=admin ibm.keycloak.endpoint_url=keycloak-host.com ibm.keycloak.realm=OSDU