diff --git a/components/esb-tools/plugins/org.wso2.integrationstudio.esb.dashboard.templates/src/org/wso2/integrationstudio/esb/dashboard/templates/maven/wizard/CommonTemplateProjectCreationWizard.java b/components/esb-tools/plugins/org.wso2.integrationstudio.esb.dashboard.templates/src/org/wso2/integrationstudio/esb/dashboard/templates/maven/wizard/CommonTemplateProjectCreationWizard.java
index 6fc0170e4a..0bfd4142e2 100644
--- a/components/esb-tools/plugins/org.wso2.integrationstudio.esb.dashboard.templates/src/org/wso2/integrationstudio/esb/dashboard/templates/maven/wizard/CommonTemplateProjectCreationWizard.java
+++ b/components/esb-tools/plugins/org.wso2.integrationstudio.esb.dashboard.templates/src/org/wso2/integrationstudio/esb/dashboard/templates/maven/wizard/CommonTemplateProjectCreationWizard.java
@@ -184,7 +184,7 @@ private void replaceStringRecursively(File file) throws IOException {
|| file.getParentFile().getName().contains("KubernetesExporter"))) {
// replace mi base image
content = content.replaceAll("wso2/wso2mi:1.1.0",
- "wso2/wso2mi:4.0.0-m8");
+ "wso2/wso2mi:4.0.0-alpha");
//replace config mapper plugin version
content = content.replaceAll("5.2.28", "5.2.32");
diff --git a/components/server-tools/plugins/org.wso2.integrationstudio.carbonserver44microei40/resources/server/deployment.toml b/components/server-tools/plugins/org.wso2.integrationstudio.carbonserver44microei40/resources/server/deployment.toml
index e6ea498cd9..97539cde4d 100644
--- a/components/server-tools/plugins/org.wso2.integrationstudio.carbonserver44microei40/resources/server/deployment.toml
+++ b/components/server-tools/plugins/org.wso2.integrationstudio.carbonserver44microei40/resources/server/deployment.toml
@@ -17,6 +17,10 @@ password = "wso2carbon"
alias = "symmetric.key.value"
algorithm = "AES"
+[dashboard_config]
+dashboard_url = "https://localhost:9743/dashboard/api/"
+heartbeat_interval = 15
+
## Following are set of example configs. Please refer docs for complete set of configurations.
# [transport.http]
diff --git a/components/server-tools/plugins/org.wso2.integrationstudio.carbonserver44microei40/src/org/wso2/integrationstudio/carbonserver44microei40/monitoring/dashboard/util/MonitoringDashboardConstants.java b/components/server-tools/plugins/org.wso2.integrationstudio.carbonserver44microei40/src/org/wso2/integrationstudio/carbonserver44microei40/monitoring/dashboard/util/MonitoringDashboardConstants.java
index bf607699bb..5bbabac789 100644
--- a/components/server-tools/plugins/org.wso2.integrationstudio.carbonserver44microei40/src/org/wso2/integrationstudio/carbonserver44microei40/monitoring/dashboard/util/MonitoringDashboardConstants.java
+++ b/components/server-tools/plugins/org.wso2.integrationstudio.carbonserver44microei40/src/org/wso2/integrationstudio/carbonserver44microei40/monitoring/dashboard/util/MonitoringDashboardConstants.java
@@ -22,7 +22,7 @@
public class MonitoringDashboardConstants {
public static final String EMPTY_STRING = "";
- public static final String MI_DASHBOARD_PATH = "mi-monitoring-dashboard" + File.separator + "bin" + File.separator;
+ public static final String MI_DASHBOARD_PATH = "mi-dashboard" + File.separator + "bin" + File.separator;
public static final String MI_DASHBOARD_APP_WINDOWS = "dashboard.bat";
public static final String MI_DASHBOARD_APP_UNIX = "dashboard.sh";
public static final String TOOLING_PATH_MAC = "/Applications/IntegrationStudio.app/Contents/Eclipse";
diff --git a/components/studio-platform/plugins/org.wso2.integrationstudio.carbonserver44microei12/src/org/wso2/integrationstudio/carbonserver44microei12/monitoring/dashboard/util/MonitoringDashboardConstants.java b/components/studio-platform/plugins/org.wso2.integrationstudio.carbonserver44microei12/src/org/wso2/integrationstudio/carbonserver44microei12/monitoring/dashboard/util/MonitoringDashboardConstants.java
index 9fa0a19540..6864319287 100644
--- a/components/studio-platform/plugins/org.wso2.integrationstudio.carbonserver44microei12/src/org/wso2/integrationstudio/carbonserver44microei12/monitoring/dashboard/util/MonitoringDashboardConstants.java
+++ b/components/studio-platform/plugins/org.wso2.integrationstudio.carbonserver44microei12/src/org/wso2/integrationstudio/carbonserver44microei12/monitoring/dashboard/util/MonitoringDashboardConstants.java
@@ -22,7 +22,7 @@
public class MonitoringDashboardConstants {
public static final String EMPTY_STRING = "";
- public static final String MI_DASHBOARD_PATH = "mi-monitoring-dashboard" + File.separator + "bin" + File.separator;
+ public static final String MI_DASHBOARD_PATH = "mi-dashboard" + File.separator + "bin" + File.separator;
public static final String MI_DASHBOARD_APP_WINDOWS = "dashboard.bat";
public static final String MI_DASHBOARD_APP_UNIX = "dashboard.sh";
public static final String TOOLING_PATH_MAC = "/Applications/IntegrationStudio.app/Contents/Eclipse";
diff --git a/components/studio-platform/plugins/org.wso2.integrationstudio.docker.distribution/resources/deployment.toml b/components/studio-platform/plugins/org.wso2.integrationstudio.docker.distribution/resources/deployment.toml
index e619440524..205f2cc88a 100644
--- a/components/studio-platform/plugins/org.wso2.integrationstudio.docker.distribution/resources/deployment.toml
+++ b/components/studio-platform/plugins/org.wso2.integrationstudio.docker.distribution/resources/deployment.toml
@@ -106,3 +106,7 @@ algorithm = "AES"
# enable = true
# userName = "admin"
# password = "admin"
+
+# [dashboard_config]
+# dashboard_url = "https://localhost:9743/dashboard/api/"
+# heartbeat_interval = 15
diff --git a/components/studio-platform/plugins/org.wso2.integrationstudio.platform.ui/src/org/wso2/integrationstudio/platform/ui/utils/PlatformUIConstants.java b/components/studio-platform/plugins/org.wso2.integrationstudio.platform.ui/src/org/wso2/integrationstudio/platform/ui/utils/PlatformUIConstants.java
index 3c1125d9c4..538f6574dd 100644
--- a/components/studio-platform/plugins/org.wso2.integrationstudio.platform.ui/src/org/wso2/integrationstudio/platform/ui/utils/PlatformUIConstants.java
+++ b/components/studio-platform/plugins/org.wso2.integrationstudio.platform.ui/src/org/wso2/integrationstudio/platform/ui/utils/PlatformUIConstants.java
@@ -38,7 +38,7 @@ public class PlatformUIConstants {
+ "((([a-z0-9]+)((__|[._]|[-]+)([a-z0-9]+))*)(\\/([a-z0-9]+)((__|[._]|[-]+)([a-z0-9]+))*)*)";
public static final String DOCKER_TAG_REGEX = "[\\w][\\w.-]{0,127}";
public static final String DOCKER_DEFAULT_BASE_REPOSITORY = "wso2/wso2mi";
- public static final String DOCKER_DEFAULT_BASE_TAG = "4.0.0-m8";
+ public static final String DOCKER_DEFAULT_BASE_TAG = "4.0.0-alpha";
public static final String MI_DEPLOYMENT_TOML_TEMPLATE_VERSION = "4.0.0";
}
diff --git a/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/icons/about_banner.png b/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/icons/about_banner.png
index bdfdb3a513..4426dae233 100644
Binary files a/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/icons/about_banner.png and b/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/icons/about_banner.png differ
diff --git a/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/splash.bmp b/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/splash.bmp
index e7f5c85773..3e26e3946b 100644
Binary files a/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/splash.bmp and b/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/splash.bmp differ
diff --git a/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/pom.xml b/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/pom.xml
index c41c36602a..723d93e322 100644
--- a/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/pom.xml
+++ b/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/pom.xml
@@ -88,13 +88,13 @@
${maven.download.plugin}
- download-mi-monitoring-dashboard
+ download-mi-dashboard
prepare-package
wget
- https://github.com/wso2/micro-integrator/releases/download/v${mi.dashboard.version}/wso2mi-monitoring-dashboard-${mi.dashboard.version}.zip
+ https://github.com/wso2/micro-integrator/releases/download/v${mi.dashboard.version}/wso2mi-dashboard-${mi.dashboard.version}.zip
false
${project.build.directory}/products
diff --git a/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/scripts/package-installer-script.sh b/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/scripts/package-installer-script.sh
index 0d86b58076..44a6c21648 100755
--- a/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/scripts/package-installer-script.sh
+++ b/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/scripts/package-installer-script.sh
@@ -46,20 +46,15 @@ unzip $PRODUCT_PATH_ROOT/WSO2-Integration-Studio-linux.gtk.x86_64.zip -d $PRODUC
unzip $PRODUCT_PATH_ROOT/WSO2-Integration-Studio-macosx.cocoa.x86_64.zip -d $PRODUCT_PATH_MACOS
unzip $PRODUCT_PATH_ROOT/WSO2-Integration-Studio-win32.win32.x86_64.zip -d $PRODUCT_PATH_WIN_64
-# Unzip mi-monitoring-dashboard to relevant packages
-unzip $PRODUCT_PATH_ROOT/wso2mi-monitoring-dashboard-${DASHBOARD_VERSION}.zip -d $PRODUCT_PATH_LINUX_64/
-unzip $PRODUCT_PATH_ROOT/wso2mi-monitoring-dashboard-${DASHBOARD_VERSION}.zip -d $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/
-unzip $PRODUCT_PATH_ROOT/wso2mi-monitoring-dashboard-${DASHBOARD_VERSION}.zip -d $PRODUCT_PATH_WIN_64/
+# Unzip mi-dashboard to relevant packages
+unzip $PRODUCT_PATH_ROOT/wso2mi-dashboard-${DASHBOARD_VERSION}.zip -d $PRODUCT_PATH_LINUX_64/
+unzip $PRODUCT_PATH_ROOT/wso2mi-dashboard-${DASHBOARD_VERSION}.zip -d $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/
+unzip $PRODUCT_PATH_ROOT/wso2mi-dashboard-${DASHBOARD_VERSION}.zip -d $PRODUCT_PATH_WIN_64/
-# Rename as "mi-monitoring-dashboard" (this is the static name used in EI Tooling code)
-mv $PRODUCT_PATH_LINUX_64/wso2mi-monitoring-dashboard-$DASHBOARD_VERSION $PRODUCT_PATH_LINUX_64/mi-monitoring-dashboard
-mv $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/wso2mi-monitoring-dashboard-$DASHBOARD_VERSION $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/mi-monitoring-dashboard
-mv $PRODUCT_PATH_WIN_64/wso2mi-monitoring-dashboard-$DASHBOARD_VERSION $PRODUCT_PATH_WIN_64/mi-monitoring-dashboard
-
-# Change default configuration to http in mi-moniroting-dashboard
-sed -i 's/transportId: "https"/transportId: "http"/g' $PRODUCT_PATH_LINUX_64/mi-monitoring-dashboard/conf/server/deployment.yaml
-sed -i 's/transportId: "https"/transportId: "http"/g' $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/mi-monitoring-dashboard/conf/server/deployment.yaml
-sed -i 's/transportId: "https"/transportId: "http"/g' $PRODUCT_PATH_WIN_64/mi-monitoring-dashboard/conf/server/deployment.yaml
+# Rename as "mi-dashboard" (this is the static name used in EI Tooling code)
+mv $PRODUCT_PATH_LINUX_64/wso2mi-dashboard-$DASHBOARD_VERSION $PRODUCT_PATH_LINUX_64/mi-dashboard
+mv $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/wso2mi-dashboard-$DASHBOARD_VERSION $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/mi-dashboard
+mv $PRODUCT_PATH_WIN_64/wso2mi-dashboard-$DASHBOARD_VERSION $PRODUCT_PATH_WIN_64/mi-dashboard
# Unzip apche maven to relevant packages
unzip $PRODUCT_PATH_ROOT/apache-maven-${APACHE_MAVEN_VERSION}-bin.zip -d $PRODUCT_PATH_LINUX_64/
@@ -167,7 +162,7 @@ popd
# Cleanup
rm $PRODUCT_PATH_ROOT/wso2mi-$PRODUCT_VERSION.zip
-rm $PRODUCT_PATH_ROOT/wso2mi-monitoring-dashboard-$DASHBOARD_VERSION.zip
+rm $PRODUCT_PATH_ROOT/wso2mi-dashboard-$DASHBOARD_VERSION.zip
rm $PRODUCT_PATH_ROOT/apache-maven-${APACHE_MAVEN_VERSION}-bin.zip
rm -rf $APICTL_DISTRIBUTION_PATH
rm -rf $PRODUCT_PATH_ROOT/temp
diff --git a/pom.xml b/pom.xml
index efba223219..d79fda962f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,9 +240,9 @@
1.0-2
1.3.1
5.18.0
- 4.0.0-m8
- 4.0.0-m8
- 1.2.0
+ 4.0.0-alpha
+ 4.0.0-alpha
+ 4.0.0-alpha
3.6.3
2.3.0