Merge pull request #650 from sajithaliyanage/development

Prepare for tooling 8.0.0-alpha release
wso2 · Feb 25, 2021 · 46b4c7e · 46b4c7e
2 parents 365bbb8 + 365e41d
commit 46b4c7e
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 23 deletions.
diff --git a/...ationstudio/esb/dashboard/templates/maven/wizard/CommonTemplateProjectCreationWizard.java b/...ationstudio/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("<dockerfile.base.image>wso2/wso2mi:1.1.0</dockerfile.base.image>",
-                            "<dockerfile.base.image>wso2/wso2mi:4.0.0-m8</dockerfile.base.image>");
+                            "<dockerfile.base.image>wso2/wso2mi:4.0.0-alpha</dockerfile.base.image>");
 
                     //replace config mapper plugin version
                     content = content.replaceAll("<version>5.2.28</version>", "<version>5.2.32</version>");

diff --git a/...ugins/org.wso2.integrationstudio.carbonserver44microei40/resources/server/deployment.toml b/...ugins/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/...tudio/carbonserver44microei40/monitoring/dashboard/util/MonitoringDashboardConstants.java b/...tudio/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/...tudio/carbonserver44microei12/monitoring/dashboard/util/MonitoringDashboardConstants.java b/...tudio/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/...platform/plugins/org.wso2.integrationstudio.docker.distribution/resources/deployment.toml b/...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/...dio.platform.ui/src/org/wso2/integrationstudio/platform/ui/utils/PlatformUIConstants.java b/...dio.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/...bution/rcp-product/org.wso2.integrationstudio.rcp.plugin/icons/about_banner.png b/...bution/rcp-product/org.wso2.integrationstudio.rcp.plugin/icons/about_banner.png
diff --git a/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/splash.bmp b/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/splash.bmp
diff --git 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 @@
                 <version>${maven.download.plugin}</version>
                 <executions>
                     <execution>
-                        <id>download-mi-monitoring-dashboard</id>
+                        <id>download-mi-dashboard</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>wget</goal>
                         </goals>
                         <configuration>
-                            <url>https://github.com/wso2/micro-integrator/releases/download/v${mi.dashboard.version}/wso2mi-monitoring-dashboard-${mi.dashboard.version}.zip</url>
+                            <url>https://github.com/wso2/micro-integrator/releases/download/v${mi.dashboard.version}/wso2mi-dashboard-${mi.dashboard.version}.zip</url>
                             <unpack>false</unpack>
                             <outputDirectory>${project.build.directory}/products</outputDirectory>
                         </configuration>

diff --git a/...on/rcp-product/org.wso2.integrationstudio.rcp.product/scripts/package-installer-script.sh b/...on/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
@@ -240,9 +240,9 @@
         <javax.xml.stream.stax.api>1.0-2</javax.xml.stream.stax.api>
         <org.codehaus.jettison>1.3.1</org.codehaus.jettison>
         <activti.designer.version>5.18.0</activti.designer.version>
-        <mi.product.version>4.0.0-m8</mi.product.version>
-        <mi.product.directory>4.0.0-m8</mi.product.directory>
-        <mi.dashboard.version>1.2.0</mi.dashboard.version>
+        <mi.product.version>4.0.0-alpha</mi.product.version>
+        <mi.product.directory>4.0.0-alpha</mi.product.directory>
+        <mi.dashboard.version>4.0.0-alpha</mi.dashboard.version>
         <apache.maven.version>3.6.3</apache.maven.version>
         <version.sortpom.plugin>2.3.0</version.sortpom.plugin>
     </properties>