6 files changed, 34 insertions, 12 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 025b63a03..9b0136f0c 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -8,7 +8,7 @@
 		the Portal team. -->
 	<groupId>org.onap.vid</groupId>
 	<artifactId>epsdk-app-onap</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>ECOMP SDK Webapp for OpenSource</name>
 	<description>ECOMP SDK Web Application for public release</description>
diff --git a/epsdk-app-onap/src/main/resources/portal.properties b/epsdk-app-onap/src/main/resources/portal.properties
index 104e85dc3..edb35807b 100755
--- a/epsdk-app-onap/src/main/resources/portal.properties
+++ b/epsdk-app-onap/src/main/resources/portal.properties
@@ -61,6 +61,9 @@ ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login
 # URL of the ECOMP Portal REST API
 ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
 
+# Non AAF Mode
+role_access_centralized = local
+
 # Applications do not need to run a UEB listener after 1607.
 ueb_listeners_enable = false
 
diff --git a/epsdk-app-onap/src/main/resources/portal_template.properties b/epsdk-app-onap/src/main/resources/portal_template.properties
index d01413aa1..51f39494c 100755
--- a/epsdk-app-onap/src/main/resources/portal_template.properties
+++ b/epsdk-app-onap/src/main/resources/portal_template.properties
@@ -13,6 +13,9 @@ ecomp_redirect_url	= ${VID_ECOMP_REDIRECT_URL}
 # URL of the ECOMP Portal REST API
 ecomp_rest_url = ${VID_ECOMP_REST_URL}
 
+# AAF Mode
+role_access_centralized = ${VID_ROLE_ACCESS_CENTRALIZED}
+
 # UEB servers
 ueb_url_list = ${VID_UEB_URL_LIST}
 
diff --git a/epsdk-app-onap/src/main/resources/vid-schema.sql b/epsdk-app-onap/src/main/resources/vid-schema.sql
index 3f15c88aa..2833cbd7b 100755
--- a/epsdk-app-onap/src/main/resources/vid-schema.sql
+++ b/epsdk-app-onap/src/main/resources/vid-schema.sql
@@ -33,6 +33,22 @@ SET FOREIGN_KEY_CHECKS = 0;
 CREATE SCHEMA IF NOT EXISTS `vid_openecomp_epsdk` ;
 
 USE vid_openecomp_epsdk;
+
+
+CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`schema_info` (
+  `SCHEMA_ID` VARCHAR(25) NOT NULL,
+  `SCHEMA_DESC` VARCHAR(75) NOT NULL,
+  `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
+  `CONNECTION_URL` VARCHAR(200) NOT NULL,
+  `USER_NAME` VARCHAR(45) NOT NULL,
+  `PASSWORD` VARCHAR(45) NULL DEFAULT NULL,
+  `DRIVER_CLASS` VARCHAR(100) NOT NULL,
+  `MIN_POOL_SIZE` INT(11) NOT NULL,
+  `MAX_POOL_SIZE` INT(11) NOT NULL,
+  `IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8;
+
 -- ----------------------------------------------------------------------------
 -- Table vid_openecomp_epsdk.cr_favorite_reports
 -- ----------------------------------------------------------------------------
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
index 60ef9a705..06a2e6b53 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
@@ -103,17 +103,17 @@ mso.max.polls=10
 mso.user.name=${VID_MSO_USER}
 mso.password.x=${VID_MSO_PASS}
 #E2E is v3
-mso.restapi.svc.e2einstance=/onap/so/infra/e2eServiceInstances/v3
+mso.restapi.svc.e2einstance=/e2eServiceInstances/v3
 mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances
 mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances
-mso.restapi.vnf.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs
-mso.restapi.vnf.changemanagement.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
-mso.restapi.network.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/networks
-mso.restapi.vf.module.scaleout=/onap/so/infra/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
-mso.restapi.vf.module.instance=/onap/so/infra//serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
-mso.restapi.volume.group.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
-mso.restapi.get.orc.req=/onap/so/infra/orchestrationRequests/v6
-mso.restapi.get.orc.reqs=/onap/so/infra/orchestrationRequests/v6?
+mso.restapi.vnf.instance=/serviceInstances/v6/<service_instance_id>/vnfs
+mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
+mso.restapi.network.instance=/serviceInstances/v6/<service_instance_id>/networks
+mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
+mso.restapi.vf.module.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
+mso.restapi.volume.group.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.get.orc.req=/orchestrationRequests/v6
+mso.restapi.get.orc.reqs=/orchestrationRequests/v6?
 mso.restapi.get.man.tasks=/tasks/v1
 mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations
 mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>
@@ -144,4 +144,4 @@ mso.dme2.client.timeout=${MSO_DME2_CLIENT_TIMEOUT}
 mso.dme2.client.read.timeout=${MSO_DME2_CLIENT_READ_TIMEOUT}
 mso.dme2.server.url=${MSO_DME2_SERVER_URL}
 mso.dme2.enabled=${MSO_DME2_ENABLED}
-
+scheduler.basic.auth=
diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties
index 02144f0fe..9723960f3 100644
--- a/epsdk-app-onap/version.properties
+++ b/epsdk-app-onap/version.properties
@@ -2,7 +2,7 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major=3
+major=4
 minor=0
 patch=0