<fileSet>\r
<includes>\r
<include>org.onap.vid.jks</include>\r
+ <include>org.onap.vid.trust.jks</include>\r
</includes>\r
<directory>../epsdk-app-onap/src/main/webapp/WEB-INF/cert</directory>\r
<outputDirectory>config</outputDirectory>\r
ENV VID_APP_DISPLAY_NAME VID\r
ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context\r
ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080\r
-ENV VID_TRUSTSTORE_FILE ${ROOT_DIR}/etc/vid_keystore.jks\r
ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins\r
-ENV VID_TRUSTSTORE_PASS 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42\r
ENV VID_MSO_USER InfraPortalClient\r
ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz\r
ENV MSO_DME2_CLIENT_TIMEOUT 10000\r
\r
ENV VID_KEYSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.jks\r
ENV VID_KEYSTORE_PASSWORD Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U\r
+ENV VID_TRUSTSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.trust.jks\r
+ENV VID_TRUSTSTORE_PASSWORD OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2\r
ENV VID_TOMCAT_PATH /usr/local/tomcat/conf/\r
ENV CATALINA_OPTS "-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}"\r
\r
ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME}\r
+ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME}\r
ADD maven/config/server.xml ${VID_TOMCAT_PATH}\r
\r
ADD maven/scripts/*.sh /tmp/vid/\r
-e 's,${MSO_DME2_SERVER_URL},'${MSO_DME2_SERVER_URL}',g' \
-e 's,${MSO_DME2_ENABLED},'${MSO_DME2_ENABLED}',g' \
-e 's,${MSO_POLLING_INTERVAL_MSECS},'${MSO_POLLING_INTERVAL_MSECS}',g' \
- -e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILE}',g' \
- -e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
+ -e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILENAME}',g' \
+ -e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASSWORD}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
exit 4
}
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;
*/
@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());
mso.asyncPollingIntervalSeconds=1\r
refreshTimeInstantiationDashboard=10\r
\r
-vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks\r
+vid.truststore.filename=/opt/app/vid/etc/org.onap.vid.trust.jks\r
+vid.truststore.passwd.x=OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2\r
mso.dme2.client.timeout=30000\r
mso.dme2.client.read.timeout=120000\r
-vid.truststore.passwd.x=OBF:1wgg1wfq1uus1uui1x131x0r1x1v1x1j1uvo1uve1wg81wfi\r
scheduler.create.new.vnf.change.instance=/v1/ChangeManagement/schedules/\r
scheduler.get.time.slots=/v1/ChangeManagement/schedules/\r
scheduler.server.url=http://BYO.scheduler:8989/scheduler\r