aboutsummaryrefslogtreecommitdiffstats
path: root/epsdk-app-onap/src/main
diff options
context:
space:
mode:
authorJakub Zieba <jakub.zieba@nokia.com>2018-09-10 08:35:18 +0200
committerJakub Zieba <jakub.zieba@nokia.com>2018-09-10 10:13:43 +0200
commitb4aa71e35ea1fc3898fc1577fd4c8f7a228f34ca (patch)
tree19b483f327cc23fb6c8637ede345eff78f0a38ed /epsdk-app-onap/src/main
parentf971858079154a57f83cd77299315ca0262e9628 (diff)
Use correct trust store
Use correct trust store file in SSL configuration Fix for schema and data creation Change-Id: Ie5b329191779a75ea902f547f09b59b65f09f64c Issue-ID: VID-271 Signed-off-by: Jakub Zieba <jakub.zieba@nokia.com>
Diffstat (limited to 'epsdk-app-onap/src/main')
-rw-r--r--epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java2
-rw-r--r--epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jksbin0 -> 1413 bytes
-rwxr-xr-xepsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties4
3 files changed, 4 insertions, 2 deletions
diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index 9cf5df548..0c6fba9a7 100644
--- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -57,6 +57,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Profile;
import org.springframework.context.annotation.PropertySource;
@@ -180,6 +181,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
*/
@Bean // ANNOTATION COMMENTED OUT
// APPLICATIONS REQUIRING QUARTZ SHOULD RESTORE ANNOTATION
+ @DependsOn("dataSourceInitializer")
public SchedulerFactoryBean schedulerFactoryBean() throws Exception {
SchedulerFactoryBean scheduler = new SchedulerFactoryBean();
scheduler.setTriggers(schedulerRegistryAdapter.getTriggers());
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks b/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks
new file mode 100644
index 000000000..4caf7be65
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks
Binary files differ
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index 087a5d54c..dc9eb43a2 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
@@ -194,10 +194,10 @@ mso.maxOpenedInstantiationRequests=20
mso.asyncPollingIntervalSeconds=1
refreshTimeInstantiationDashboard=10
-vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks
+vid.truststore.filename=/opt/app/vid/etc/org.onap.vid.trust.jks
+vid.truststore.passwd.x=OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2
mso.dme2.client.timeout=30000
mso.dme2.client.read.timeout=120000
-vid.truststore.passwd.x=OBF:1wgg1wfq1uus1uui1x131x0r1x1v1x1j1uvo1uve1wg81wfi
scheduler.create.new.vnf.change.instance=/v1/ChangeManagement/schedules/
scheduler.get.time.slots=/v1/ChangeManagement/schedules/
scheduler.server.url=http://BYO.scheduler:8989/scheduler