replaced references to whizcontrol with tip.wlan

This commit is contained in:
Dmitry Toptygin
2020-03-24 18:08:00 -04:00
parent 9a26d35c80
commit 9a597231f4
5 changed files with 10 additions and 24 deletions

View File

@@ -16,7 +16,7 @@ app.name=OpenSyncManager
# System property -Dspring.profiles.active=production
# or specified on the command line using the switch --spring.profiles.active=dev,hsqldb
#
# This does not work: spring.profiles.active=${whizcontrol.core.server.security},${whizcontrol.core.server.auth},Extra_${app.name}
# This does not work: spring.profiles.active=${tip.wlan.core.server.security},${tip.wlan.core.server.auth},Extra_${app.name}
# Substitution of ${} in application.properties works in general, but not for spring.profiles.active and not for spring.profiles.include properties
#
# *** Do not set spring.profiles.active property in this file, or be prepared for the World of Weird.
@@ -76,35 +76,21 @@ app.name=OpenSyncManager
#spring.profiles.include=use_ssl,client_certificate_auth
spring.profiles.include=use_ssl_with_client_cert_and_basic_auth,client_certificate_and_basic_auth,rest-template-single-user-per-service-digest-auth,use_single_ds,opensync_static_config
whizcontrol.equipmentAndNetworkManagementServiceBaseUrl=https://localhost:9094
#used by *-remote client classes when they authenticate their requests
whizcontrol.httpClientConfig=classpath:httpClientConfig.json
tip.wlan.httpClientConfig=classpath:httpClientConfig.json
#this user/password is used together with http_digest_auth and http_basic_auth spring profiles
whizcontrol.serviceUser=user
whizcontrol.servicePassword=password
tip.wlan.serviceUser=user
tip.wlan.servicePassword=password
spring.main.show-banner=false
server.port=9096
#this port is used by secondary server connector, it is protected by digest authentication, while primary server.port is protected by client certificate auth
whizcontrol.secondaryPort=7071
tip.wlan.secondaryPort=7071
#this server only supports REST requests, CSRF would get in the way
whizcontrol.csrf-enabled=false
whizcontrol.emailVerificationTokenExpiryMs=600
whizcontrol.passwordResetTokenExpiryMs=3600
whizcontrol.customerAccountManagementServiceBaseUrl=https://localhost:9092
whizcontrol.orderAndSubscriptionManagementServiceBaseUrl=https://localhost:9093
whizcontrol.equipmentAndNetworkManagementServiceBaseUrl=https://localhost:9094
whizcontrol.equipmentConfigurationManagerServiceBaseUrl=https://localhost:9082
whizcontrol.equipmentStatusAndAlarmCollectorServiceBaseUrl=https://localhost:9083
whizcontrol.equipmentMetricsCollectorServiceBaseUrl=https://localhost:9085
whizcontrol.equipmentRoutingServiceBaseUrl=https://localhost:9081
whizcontrol.firmwareManagementServiceBaseUrl=https://localhost:9072
whizcontrol.equipmentEventCollectorServiceBaseUrl=https://localhost:9076
tip.wlan.csrf-enabled=false
#server.session-timeout= # session timeout in seconds
#server.tomcat.max-threads = 0 # number of threads in protocol handler

View File

@@ -13,5 +13,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.telecominfraproject.wlan.opensync.experiment.OpenSyncProcess"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-static-process"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties&#10;-Dwhizcontrol.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.ovsdb.configFileName=${project_loc:opensync-ext-static}/src/main/resources/config_2_ssids.json&#10;&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dspring.profiles.include=mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.ovsdb.configFileName=${project_loc:opensync-ext-static}/src/main/resources/config_2_ssids.json&#10;&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dspring.profiles.include=mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
</launchConfiguration>