Merge pull request #586 from sajithaliyanage/development

Preparations for tooling 8.0.0-m3 release
wso2 · Jan 12, 2021 · 978a62b · 978a62b
2 parents 86133bd + dc5eba9
commit 978a62b
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 32 deletions.
diff --git a/...s/org.wso2.integrationstudio.esb.dashboard.templates/NewSamples/HelloDocker/IS_SAMPLE.zip b/...s/org.wso2.integrationstudio.esb.dashboard.templates/NewSamples/HelloDocker/IS_SAMPLE.zip
diff --git a/...g.wso2.integrationstudio.esb.dashboard.templates/NewSamples/HelloKubernetes/IS_SAMPLE.zip b/...g.wso2.integrationstudio.esb.dashboard.templates/NewSamples/HelloKubernetes/IS_SAMPLE.zip
diff --git a/...ationstudio/esb/dashboard/templates/maven/wizard/CommonTemplateProjectCreationWizard.java b/...ationstudio/esb/dashboard/templates/maven/wizard/CommonTemplateProjectCreationWizard.java
@@ -184,13 +184,13 @@ 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:1.2.0</dockerfile.base.image>");
+                            "<dockerfile.base.image>wso2/wso2mi:4.0.0-m3</dockerfile.base.image>");
 
                     //replace config mapper plugin version
                     content = content.replaceAll("<version>5.2.28</version>", "<version>5.2.32</version>");
 
                     //replace config mapper plugin's mi version
-                    content = content.replaceAll("<miVersion>1.1.0</miVersion>", "<miVersion>1.2.0</miVersion>");
+                    content = content.replaceAll("<miVersion>1.2.0</miVersion>", "<miVersion>4.0.0</miVersion>");
 
                     //replace dockerfile-spotify plugin version
                     content = content.replaceAll("<version>1.4.13</version>", "<version>1.4.13</version>");

diff --git a/...platform/plugins/org.wso2.integrationstudio.docker.distribution/resources/deployment.toml b/...platform/plugins/org.wso2.integrationstudio.docker.distribution/resources/deployment.toml
@@ -6,14 +6,14 @@ hot_deployment = false
 [user_store]
 type = "read_only_ldap"
 
-[keystore.tls]
-file_name = "wso2carbon.jks"
+[keystore.primary]
+file_name = "repository/resources/security/wso2carbon.jks"
 password = "wso2carbon"
 alias = "wso2carbon"
 key_password = "wso2carbon"
 
 [truststore]
-file_name = "client-truststore.jks"
+file_name = "repository/resources/security/client-truststore.jks"
 password = "wso2carbon"
 alias = "symmetric.key.value"
 algorithm = "AES"
@@ -27,6 +27,7 @@ algorithm = "AES"
 
 # [transport.jms]
 # sender_enable = true
+# listener_enable = true
 
 # [[transport.jms.sender]]
 # name = "myQueueSender"
@@ -36,8 +37,6 @@ algorithm = "AES"
 # parameter.connection_factory_type = "queue"
 # parameter.cache_level = "producer"
 
-# [transport.jms]
-# listener_enable = true
 
 #[[transport.jms.listener]]
 # name = "myQueueConnectionFactory"
@@ -58,6 +57,7 @@ algorithm = "AES"
 
 # [transport.rabbitmq]
 # sender_enable = true
+# listener_enable = true
 
 # [[transport.rabbitmq.sender]]
 # name = "AMQPConnectionFactory"
@@ -66,9 +66,6 @@ algorithm = "AES"
 # parameter.username = "guest"
 # parameter.password = "guest"
 
-# [transport.rabbitmq]
-# listener_enable = true
-
 # [[transport.rabbitmq.listener]]
 # name = "AMQPConnectionFactory"
 # parameter.hostname = "localhost"

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 = "1.2.0";
-    public static final String MI_DEPLOYMENT_TOML_TEMPLATE_VERSION = "1.2.0";
+    public static final String DOCKER_DEFAULT_BASE_TAG = "4.0.0-m3";
+    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.plugin/splash_old.bmp b/distribution/rcp-product/org.wso2.integrationstudio.rcp.plugin/splash_old.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
@@ -106,7 +106,7 @@
                             <goal>wget</goal>
                         </goals>
                         <configuration>
-                            <url>https://github.com/wso2/micro-integrator/releases/download/v${mi.product.version}/wso2mi-monitoring-dashboard-${mi.product.version}.zip</url>
+                            <url>https://github.com/wso2/micro-integrator/releases/download/v${mi.dashboard.version}/wso2mi-monitoring-dashboard-${mi.dashboard.version}.zip</url>
                             <unpack>false</unpack>
                             <outputDirectory>${project.build.directory}/products</outputDirectory>
                         </configuration>
@@ -217,7 +217,7 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <commandlineArgs>${mi.product.version} ${apache.maven.version} ${mi.product.directory}</commandlineArgs>
+                            <commandlineArgs>${mi.product.version} ${apache.maven.version} ${mi.product.directory} ${mi.dashboard.version}</commandlineArgs>
                             <executable>${project.basedir}/scripts/package-installer-script.sh</executable>
                         </configuration>
                     </execution>

diff --git a/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/resources/deployment.toml b/distribution/rcp-product/org.wso2.integrationstudio.rcp.product/resources/deployment.toml
@@ -5,14 +5,14 @@ hostname = "localhost"
 [user_store]
 type = "read_only_ldap"
 
-[keystore.tls]
-file_name = "wso2carbon.jks"
+[keystore.primary]
+file_name = "repository/resources/security/wso2carbon.jks"
 password = "wso2carbon"
 alias = "wso2carbon"
 key_password = "wso2carbon"
 
 [truststore]
-file_name = "client-truststore.jks"
+file_name = "repository/resources/security/client-truststore.jks"
 password = "wso2carbon"
 alias = "symmetric.key.value"
 algorithm = "AES"
@@ -26,6 +26,7 @@ algorithm = "AES"
 
 # [transport.jms]
 # sender_enable = true
+# listener_enable = true
 
 # [[transport.jms.sender]]
 # name = "myQueueSender"
@@ -35,8 +36,6 @@ algorithm = "AES"
 # parameter.connection_factory_type = "queue"
 # parameter.cache_level = "producer"
 
-# [transport.jms]
-# listener_enable = true
 
 #[[transport.jms.listener]]
 # name = "myQueueConnectionFactory"
@@ -57,6 +56,7 @@ algorithm = "AES"
 
 # [transport.rabbitmq]
 # sender_enable = true
+# listener_enable = true
 
 # [[transport.rabbitmq.sender]]
 # name = "AMQPConnectionFactory"
@@ -65,9 +65,6 @@ algorithm = "AES"
 # parameter.username = "guest"
 # parameter.password = "guest"
 
-# [transport.rabbitmq]
-# listener_enable = true
-
 # [[transport.rabbitmq.listener]]
 # name = "AMQPConnectionFactory"
 # parameter.hostname = "localhost"

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
@@ -3,8 +3,9 @@ BASE_DIR=$(pwd)
 PRODUCT_VERSION=$1
 APACHE_MAVEN_VERSION=$2
 PRODUCT_DIRECTORY=$3
+DASHBOARD_VERSION=$4
 
-echo BASE_DIR $BASE_DIR and PRODUCT_VERSION $PRODUCT_VERSION
+echo BASE_DIR: $BASE_DIR, PRODUCT_VERSION: $PRODUCT_VERSION and DASHBOARD_VERSION: $DASHBOARD_VERSION
 
 # Product extraction locations
 PRODUCT_PATH_ROOT=$BASE_DIR/target/products
@@ -60,14 +61,14 @@ mv $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/runtime/wso2mi-$PR
 mv $PRODUCT_PATH_WIN_64/runtime/wso2mi-$PRODUCT_DIRECTORY $PRODUCT_PATH_WIN_64/runtime/microesb
 
 # Unzip mi-monitoring-dashboard to relevant packages
-unzip $PRODUCT_PATH_ROOT/wso2mi-monitoring-dashboard-${PRODUCT_VERSION}.zip -d $PRODUCT_PATH_LINUX_64/
-unzip $PRODUCT_PATH_ROOT/wso2mi-monitoring-dashboard-${PRODUCT_VERSION}.zip -d $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/
-unzip $PRODUCT_PATH_ROOT/wso2mi-monitoring-dashboard-${PRODUCT_VERSION}.zip -d $PRODUCT_PATH_WIN_64/
+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/
 
 # Rename as "mi-monitoring-dashboard" (this is the static name used in EI Tooling code)
-mv $PRODUCT_PATH_LINUX_64/wso2mi-monitoring-dashboard-$PRODUCT_DIRECTORY $PRODUCT_PATH_LINUX_64/mi-monitoring-dashboard
-mv $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/wso2mi-monitoring-dashboard-$PRODUCT_DIRECTORY $PRODUCT_PATH_MACOS/IntegrationStudio.app/Contents/Eclipse/mi-monitoring-dashboard
-mv $PRODUCT_PATH_WIN_64/wso2mi-monitoring-dashboard-$PRODUCT_DIRECTORY $PRODUCT_PATH_WIN_64/mi-monitoring-dashboard
+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
@@ -185,7 +186,7 @@ popd
 
 # Cleanup
 rm $PRODUCT_PATH_ROOT/wso2mi-$PRODUCT_VERSION.zip
-rm $PRODUCT_PATH_ROOT/wso2mi-monitoring-dashboard-$PRODUCT_VERSION.zip
+rm $PRODUCT_PATH_ROOT/wso2mi-monitoring-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
@@ -233,8 +233,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>1.2.0-rc1</mi.product.version>
-        <mi.product.directory>1.2.0</mi.product.directory>
+        <mi.product.version>4.0.0-m3</mi.product.version>
+        <mi.product.directory>4.0.0-m3</mi.product.directory>
+        <mi.dashboard.version>1.2.0</mi.dashboard.version>
         <apache.maven.version>3.6.3</apache.maven.version>
         <version.sortpom.plugin>2.3.0</version.sortpom.plugin>
     </properties>