Merge pull request #2973 from RestComm/FS-56_change_rvd_context

FS-56 Changed RVD context 'restcomm-rvd' -> 'visual-designer'

Author: gvagenas

release/build.xml

@@ -47,7 +47,7 @@
   <get src="https://api.github.com/repos/RestComm/visual-designer/releases/latest" dest="${configuration.directory}/rvd-latest-release.json"></get>
   <replaceregexp file="${configuration.directory}/rvd-latest-release.json" match='.*"browser_download_url":"([^"]+)".*' replace="\1"/>
   <loadfile property="restcomm-rvd.github-download.url" srcFile="${configuration.directory}/rvd-latest-release.json"/>
-  <property name="restcomm-rvd.path" value="${configuration.directory}/restcomm-rvd.war"/>
+  <property name="restcomm-rvd.path" value="${configuration.directory}/visual-designer.war"/>
   <delete file="${configuration.directory}/rvd-latest-release.json"/>
 
   <condition property="restcomm-rvd.download.url" value="https://oss.sonatype.org/content/groups/public/org/restcomm/restcomm-connect-rvd/${rvd.version}/restcomm-connect-rvd-${rvd.version}.war" else="${restcomm-rvd.github-download.url}">
@@ -157,7 +157,7 @@
     <exec executable="wget" failonerror="true">
       <arg value="${restcomm-rvd.download.url}"/>
     </exec>
-    <move file="${base.dir}/restcomm-rvd.war" todir="${configuration.directory}"/>
+    <move file="${base.dir}/visual-designer.war" todir="${configuration.directory}"/>
   </target>
 
   <target depends="get-restcomm-media" name="extract-restcomm-media">
@@ -218,8 +218,8 @@
     <touch file="${release.as7.dir}/standalone/deployments/restcomm-management.war.dodeploy"/>
 
     <!-- Copy RVD -->
-    <unzip dest="${release.as7.dir}/standalone/deployments/restcomm-rvd.war" src="${configuration.directory}/restcomm-rvd.war"/>
-    <touch file="${release.as7.dir}/standalone/deployments/restcomm-rvd.war.dodeploy"/>
+    <unzip dest="${release.as7.dir}/standalone/deployments/visual-designer.war" src="${configuration.directory}/visual-designer.war"/>
+    <touch file="${release.as7.dir}/standalone/deployments/visual-designer.war.dodeploy"/>
 
     <!--Copy Rvd ES Demo-->
     <copy failonerror="true" file="${configuration.directory}/RvdExternalServicesDemo.war" tofile="${release.as7.dir}/standalone/deployments/RvdExternalServicesDemo.war"/>

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh

@@ -34,7 +34,7 @@ SslRestCommConf(){
 	echo "Will properly configure HTTPS Connector ";
 	  FILERESTCOMMXML=$BASEDIR/standalone/deployments/restcomm.war/WEB-INF/web.xml
       FILEMANAGERXML=$BASEDIR/standalone/deployments/restcomm-management.war/WEB-INF/web.xml
-      FILERVDXML=$BASEDIR/standalone/deployments/restcomm-rvd.war/WEB-INF/web.xml
+      FILERVDXML=$BASEDIR/standalone/deployments/visual-designer.war/WEB-INF/web.xml
       FILEOLYMPUSXML=$BASEDIR/standalone/deployments/olympus.war/WEB-INF/web.xml
 	#Disable HTTP if set to true.
 	if [[ "$DISABLE_HTTP" == "true" || "$DISABLE_HTTP" == "TRUE" ]]; then

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-dashboard.sh

@@ -24,7 +24,7 @@ fi
 DASHBOARD_ROOT="$RESTCOMM_HOME"/standalone/deployments/restcomm-management.war
 DASHBOARD_JSON_FILE="$DASHBOARD_ROOT"/conf/dashboard.json
 
-sed -i  "s|\"rvdUrl\":\"[^\"]*\"|\"rvdUrl\":\"$RVD_URL/restcomm-rvd\"|" "$DASHBOARD_JSON_FILE"
+sed -i  "s|\"rvdUrl\":\"[^\"]*\"|\"rvdUrl\":\"$RVD_URL/visual-designer\"|" "$DASHBOARD_JSON_FILE"
 
 echo "Dasboard configured:"
 cat $DASHBOARD_JSON_FILE

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh

@@ -11,7 +11,7 @@ RESTCOMM_BIN=$RESTCOMM_HOME/bin
 RESTCOMM_DARS=$RESTCOMM_HOME/standalone/configuration/dars
 RESTCOMM_CONF=$RESTCOMM_HOME/standalone/configuration
 RESTCOMM_DEPLOY=$RESTCOMM_HOME/standalone/deployments/restcomm.war
-RVD_DEPLOY_PATH=$RESTCOMM_HOME/standalone/deployments/restcomm-rvd.war
+RVD_DEPLOY_PATH=$RESTCOMM_HOME/standalone/deployments/visual-designer.war
 
 ## FUNCTIONS
 

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-rvd.sh

@@ -11,12 +11,12 @@
 ## requirements:
 ##
 ##	RESTCOMM_HOME env variable to be set
-##  rvd.xml should be in place (under $RESTCOMM_HOME/standalone/deployments/restcomm-rvd.war)
+##  rvd.xml should be in place (under $RESTCOMM_HOME/standalone/deployments/visual-designer.war)
 ##
 ## Author: [email protected] - Orestis Tsakiridis
 
 # Variables
-RVD_ROOT=$RESTCOMM_HOME/standalone/deployments/restcomm-rvd.war
+RVD_ROOT=$RESTCOMM_HOME/standalone/deployments/visual-designer.war
 RVD_XML_FILE=$RVD_ROOT/WEB-INF/rvd.xml
 
 updateVideoSupport() {

restcomm/configuration/mobicents_build.xml

@@ -222,13 +222,13 @@
         	file="${workspace.mobicents-restcomm.dir}/restcomm.ui/target/restcomm-management.war"/>
 
 	<!-- Copy RVD -->
-        <!--<copy todir="${release.tomcat.dir}/webapps/restcomm-rvd" failonerror="true">
-		<fileset dir="${workspace.mobicents-restcomm.dir}/restcomm.rvd/target/restcomm-rvd">
+        <!--<copy todir="${release.tomcat.dir}/webapps/visual-designer" failonerror="true">
+		<fileset dir="${workspace.mobicents-restcomm.dir}/restcomm.rvd/target/visual-designer">
                         <include name="**/*" />
                 </fileset>
         </copy>-->
-	<copy tofile="${release.tomcat.dir}/webapps/restcomm-rvd.war" failonerror="true"
-		file="${workspace.mobicents-restcomm.dir}/restcomm.rvd/target/restcomm-rvd.war"/>
+	<copy tofile="${release.tomcat.dir}/webapps/visual-designer.war" failonerror="true"
+		file="${workspace.mobicents-restcomm.dir}/restcomm.rvd/target/visual-designer.war"/>
 
 	<!--Copy Rvd ES Demo-->
 	<copy tofile="${release.tomcat.dir}/webapps/RvdExternalServicesDemo.war" failonerror="true"
@@ -274,12 +274,12 @@
 	<touch file="${release.as7.dir}/standalone/deployments/restcomm-management.war.dodeploy" />
 
 	<!-- Copy RVD -->
-        <copy todir="${release.as7.dir}/standalone/deployments/restcomm-rvd.war" failonerror="true">
-		<fileset dir="${workspace.mobicents-restcomm.dir}/restcomm.rvd/target/restcomm-rvd">
+        <copy todir="${release.as7.dir}/standalone/deployments/visual-designer.war" failonerror="true">
+		<fileset dir="${workspace.mobicents-restcomm.dir}/restcomm.rvd/target/visual-designer">
                         <include name="**/*" />
                 </fileset>
         </copy>
-	<touch file="${release.as7.dir}/standalone/deployments/restcomm-rvd.war.dodeploy" />
+	<touch file="${release.as7.dir}/standalone/deployments/visual-designer.war.dodeploy" />
 
 	<!--Copy Rvd ES Demo-->
 	<copy tofile="${release.as7.dir}/standalone/deployments/RvdExternalServicesDemo.war" failonerror="true"

restcomm/restcomm.application/src/main/java/org/restcomm/connect/application/RvdProjectsMigrationHelper.java

@@ -78,15 +78,15 @@
  */
 public class RvdProjectsMigrationHelper {
 
-    private static final String CONTEXT_NAME_RVD = "restcomm-rvd.war";
+    private static final String CONTEXT_NAME_RVD = "visual-designer.war";
     private static final String WORKSPACE_DIRECTORY_NAME = "workspace";
     private static final String PROTO_DIRECTORY_PREFIX = "_proto";
     private static final String USERS_DIRECTORY_NAME = "@users";
-    private static final Pattern RVD_PROJECT_URL = Pattern.compile("^\\/restcomm-rvd.*\\/(.*)\\/controller$");
+    private static final Pattern RVD_PROJECT_URL = Pattern.compile("^\\/visual-designer.*\\/(.*)\\/controller$");
     private static final String ACCOUNT_NOTIFICATIONS_SID = "ACae6e420f425248d6a26948c17a9e2acf";
     private static final String EMBEDDED_DIRECTORY_NAME = "workspace-migration";
 
-    private boolean embeddedMigration = false; // If restcomm-rvd context is not found, search for internal structure
+    private boolean embeddedMigration = false; // If visual-designer context is not found, search for internal structure
 
     private Configuration configuration;
     private String workspacePath;
@@ -277,7 +277,7 @@ public String createOrUpdateApplicationEntity(String applicationSid, String proj
         try {
             if(applicationSid != null) {
                 // Update application
-                currentApplication = currentApplication.setRcmlUrl(URI.create("/restcomm-rvd/services/apps/" + applicationSid
+                currentApplication = currentApplication.setRcmlUrl(URI.create("/visual-designer/services/apps/" + applicationSid
                         + "/controller"));
                 applicationDao.updateApplication(currentApplication);
                 return applicationSid;
@@ -301,7 +301,7 @@ public String createOrUpdateApplicationEntity(String applicationSid, String proj
                 buffer.append(rootUri).append(configuration.subset("runtime-settings").getString("api-version"))
                 .append("/Accounts/").append(account.getSid().toString()).append("/Applications/").append(sid.toString());
                 builder.setUri(URI.create(buffer.toString()));
-                builder.setRcmlUrl(URI.create("/restcomm-rvd/services/apps/" + sid.toString() + "/controller"));
+                builder.setRcmlUrl(URI.create("/visual-designer/services/apps/" + sid.toString() + "/controller"));
                 builder.setKind(Application.Kind.getValueOf(currentStateHeader.getProjectKind()));
                 currentApplication = builder.build();
                 applicationDao.addApplication(currentApplication);

restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml

@@ -609,14 +609,14 @@
 
 	<!-- Control notifications sent to rcmlserver (RVD)
 		base-url: Base url where rcml server is located of the form scheme://host:port like 'http://rvdserver:8080'. Leave it empty when RVD is bundled together with restcomm.
-		api-path: relative path where rcml server api listens under like '/restcomm-rvd/services
+		api-path: relative path where rcml server api listens under like '/visual-designer/services
 		notifications: should notifications be sent or not ? defaults to 'false'
 		timeout: milis to wait response from rcmlserver before timing out when sending notifications. Defaults to 5000
 		timeout-per-notification: if several notifications are sent in one step, timeout increase for each. Defaults to 500.
 	-->
 	<rcmlserver>
 		<base-url></base-url>
-		<api-path>/restcomm-rvd/services</api-path>
+		<api-path>/visual-designer/services</api-path>
 		<notifications>true</notifications>
 		<timeout>5000</timeout>
 		<timeout-per-notification>500</timeout-per-notification>

restcomm/restcomm.application/src/main/webapp/WEB-INF/data/hsql/restcomm.script

@@ -33,9 +33,9 @@ SET WRITE_DELAY 10
 SET SCHEMA PUBLIC
 INSERT INTO "restcomm_organizations" VALUES('ORafbe225ad37541eba518a74248f0ac4c', 'default.restcomm.com', '2017-04-19 00:00:00.000000000','2017-04-19 00:00:00.000000000', 'active')
 INSERT INTO "restcomm_accounts" VALUES('ACae6e420f425248d6a26948c17a9e2acf','2012-04-24 00:00:00.000000000','2012-04-24 00:00:00.000000000','[email protected]','Default Administrator Account',NULL,'Full','uninitialized','77f8c12cc7b8f8423e5c38b035249166','Administrator','/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf','ORafbe225ad37541eba518a74248f0ac4c')
-INSERT INTO "restcomm_applications" VALUES('AP73926e7113fa4d95981aa96b76eca854','2015-09-23 06:56:04.108000','2015-09-23 06:56:04.108000','rvdCollectVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP73926e7113fa4d95981aa96b76eca854','/restcomm-rvd/services/apps/AP73926e7113fa4d95981aa96b76eca854/controller','voice')
-INSERT INTO "restcomm_applications" VALUES('AP81cf45088cba4abcac1261385916d582','2015-09-23 06:56:17.977000','2015-09-23 06:56:17.977000','rvdESDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP81cf45088cba4abcac1261385916d582','/restcomm-rvd/services/apps/AP81cf45088cba4abcac1261385916d582/controller','voice')
-INSERT INTO "restcomm_applications" VALUES('APb70c33bf0b6748f09eaec97030af36f3','2015-09-23 06:56:26.120000','2015-09-23 06:56:26.120000','rvdSayVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/APb70c33bf0b6748f09eaec97030af36f3','/restcomm-rvd/services/apps/APb70c33bf0b6748f09eaec97030af36f3/controller','voice')
+INSERT INTO "restcomm_applications" VALUES('AP73926e7113fa4d95981aa96b76eca854','2015-09-23 06:56:04.108000','2015-09-23 06:56:04.108000','rvdCollectVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP73926e7113fa4d95981aa96b76eca854','/visual-designer/services/apps/AP73926e7113fa4d95981aa96b76eca854/controller','voice')
+INSERT INTO "restcomm_applications" VALUES('AP81cf45088cba4abcac1261385916d582','2015-09-23 06:56:17.977000','2015-09-23 06:56:17.977000','rvdESDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP81cf45088cba4abcac1261385916d582','/visual-designer/services/apps/AP81cf45088cba4abcac1261385916d582/controller','voice')
+INSERT INTO "restcomm_applications" VALUES('APb70c33bf0b6748f09eaec97030af36f3','2015-09-23 06:56:26.120000','2015-09-23 06:56:26.120000','rvdSayVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/APb70c33bf0b6748f09eaec97030af36f3','/visual-designer/services/apps/APb70c33bf0b6748f09eaec97030af36f3/controller','voice')
 INSERT INTO "restcomm_incoming_phone_numbers" VALUES('PN146638eec1e2415d832785e30d227598','2013-10-11 14:56:08.549000000','2013-10-11 14:56:08.549000000','This app plays the Hello World msg and requires Text-to-speech ','ACae6e420f425248d6a26948c17a9e2acf','+1235','2012-04-24',FALSE,'/restcomm/demos/hello-world.xml','POST',NULL,'POST',NULL,'POST',NULL,NULL,'POST',NULL,'POST',NULL,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/IncomingPhoneNumbers/PN146638eec1e2415d832785e30d227598',NULL,NULL,NULL,NULL, TRUE,'0.0',NULL,NULL,NULL,NULL,NULL, NULL, NULL, NULL, 'ORafbe225ad37541eba518a74248f0ac4c')
 INSERT INTO "restcomm_incoming_phone_numbers" VALUES('PNabf9c98b95d64b26b5993ad52e809566','2013-10-11 14:55:56.670000000','2013-10-11 14:55:56.670000000','This app uses the collect verb to get user input','ACae6e420f425248d6a26948c17a9e2acf','+1236','2012-04-24',FALSE,'/restcomm/demos/gather/hello-gather.xml','POST',NULL,'POST',NULL,'POST',NULL,NULL,'POST',NULL,'POST',NULL,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/IncomingPhoneNumbers/PNabf9c98b95d64b26b5993ad52e809566',NULL,NULL,NULL,NULL, TRUE,'0.0',NULL,NULL,NULL,NULL,NULL, NULL, NULL, NULL, 'ORafbe225ad37541eba518a74248f0ac4c')
 INSERT INTO "restcomm_incoming_phone_numbers" VALUES('PNdd7a0a0248244615978bd5781598e5eb','2013-10-04 17:42:02.500000000','2013-10-04 17:42:02.500000000','This app plays pre-recorded audio file','ACae6e420f425248d6a26948c17a9e2acf','+1234','2012-04-24',FALSE,'/restcomm/demos/hello-play.xml','POST',NULL,'POST',NULL,'POST',NULL,NULL,'POST',NULL,'POST',NULL,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/IncomingPhoneNumbers/PNdd7a0a0248244615978bd5781598e5eb',NULL,NULL,NULL,NULL, TRUE,'0.0',NULL,NULL,NULL,NULL,NULL, NULL, NULL, NULL, 'ORafbe225ad37541eba518a74248f0ac4c')

restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/init.sql

@@ -442,9 +442,9 @@ null,
 "ORafbe225ad37541eba518a74248f0ac4c");
 
 /* Create demo Applications */
-INSERT INTO restcomm_applications VALUES('AP73926e7113fa4d95981aa96b76eca854','2015-09-23 06:56:04.108000','2015-09-23 06:56:04.108000','rvdCollectVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP73926e7113fa4d95981aa96b76eca854','/restcomm-rvd/services/apps/AP73926e7113fa4d95981aa96b76eca854/controller','voice');
-INSERT INTO restcomm_applications VALUES('AP81cf45088cba4abcac1261385916d582','2015-09-23 06:56:17.977000','2015-09-23 06:56:17.977000','rvdESDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP81cf45088cba4abcac1261385916d582','/restcomm-rvd/services/apps/AP81cf45088cba4abcac1261385916d582/controller','voice');
-INSERT INTO restcomm_applications VALUES('APb70c33bf0b6748f09eaec97030af36f3','2015-09-23 06:56:26.120000','2015-09-23 06:56:26.120000','rvdSayVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/APb70c33bf0b6748f09eaec97030af36f3','/restcomm-rvd/services/apps/APb70c33bf0b6748f09eaec97030af36f3/controller','voice');
+INSERT INTO restcomm_applications VALUES('AP73926e7113fa4d95981aa96b76eca854','2015-09-23 06:56:04.108000','2015-09-23 06:56:04.108000','rvdCollectVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP73926e7113fa4d95981aa96b76eca854','/visual-designer/services/apps/AP73926e7113fa4d95981aa96b76eca854/controller','voice');
+INSERT INTO restcomm_applications VALUES('AP81cf45088cba4abcac1261385916d582','2015-09-23 06:56:17.977000','2015-09-23 06:56:17.977000','rvdESDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/AP81cf45088cba4abcac1261385916d582','/visual-designer/services/apps/AP81cf45088cba4abcac1261385916d582/controller','voice');
+INSERT INTO restcomm_applications VALUES('APb70c33bf0b6748f09eaec97030af36f3','2015-09-23 06:56:26.120000','2015-09-23 06:56:26.120000','rvdSayVerbDemo','ACae6e420f425248d6a26948c17a9e2acf','2012-04-24',FALSE,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/Applications/APb70c33bf0b6748f09eaec97030af36f3','/visual-designer/services/apps/APb70c33bf0b6748f09eaec97030af36f3/controller','voice');
 
 /* Bind default DID to demo apps */
 INSERT INTO restcomm_incoming_phone_numbers VALUES('PNdd7a0a0248244615978bd5781598e5eb','2013-10-04 17:42:02.500000000','2013-10-04 17:42:02.500000000','234','ACae6e420f425248d6a26948c17a9e2acf','+1234','2012-04-24',FALSE,'/restcomm/demos/hello-play.xml','POST',NULL,'POST',NULL,'POST',NULL,NULL,'POST',NULL,'POST',NULL,'/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf/IncomingPhoneNumbers/PNdd7a0a0248244615978bd5781598e5eb', true, false, false, false, true, 0.0, null, null, null, null, null, null, null, null, 'ORafbe225ad37541eba518a74248f0ac4c');