From 87a6bd894f4499819fa5b1e59c1708b4b8543a1d Mon Sep 17 00:00:00 2001 From: charitha Date: Fri, 22 May 2020 20:50:29 +0530 Subject: [PATCH] Fix pom issues for 4.0.0 release --- .../org.wso2.iot.core.admin.styles/pom.xml | 8 +++--- .../src/main/resources/web/product/about.html | 12 ++++----- modules/components/pom.xml | 10 +++---- modules/cxf-filters/pom.xml | 4 +-- modules/distribution/pom.xml | 4 +-- modules/distribution/src/assembly/bin.xml | 2 +- .../src/core/bin/profile-creator.bat | 2 +- .../src/core/bin/profile-creator.sh | 4 +-- .../src/core/conf/axis2/axis2.xml | 4 +-- .../privacy-policies/pages/cookie-policy.jag | 12 ++++----- .../privacy-policies/pages/privacy-policy.jag | 4 +-- .../distribution/src/core/release-notes.html | 14 +++++----- .../org.wso2.iot.core.styles.feature/pom.xml | 12 ++++----- modules/features/pom.xml | 10 +++---- modules/integration/pom.xml | 10 +++---- .../tests-common/integration-common/pom.xml | 4 +-- modules/integration/tests-common/pom.xml | 6 ++--- .../tests-common/web-ui-pages/pom.xml | 4 +-- .../src/main/resources/mapper.properties | 6 ++--- modules/integration/tests-integration/pom.xml | 8 +++--- modules/integration/tests-iot-web-ui/pom.xml | 12 ++++----- modules/p2-profile/analytics-profile/pom.xml | 8 +++--- modules/p2-profile/broker-profile/pom.xml | 8 +++--- modules/p2-profile/iot-core-profile/pom.xml | 10 +++---- modules/p2-profile/pom.xml | 10 +++---- modules/scripts/mobile-qsg/pom.xml | 6 ++--- .../scripts/mobile-qsg/resources/Readme.txt | 4 +-- .../mobile-qsg/resources/mobile-qsg.sh | 4 +-- modules/scripts/pom.xml | 8 +++--- .../tools/cdmf-devicetype-archetype/pom.xml | 8 +++--- .../component/analytics/pom.xml | 2 +- .../api/src/main/webapp/WEB-INF/web.xml | 4 +-- .../component/plugin/pom.xml | 2 +- .../type-view.hbs | 2 +- .../feature/feature/pom.xml | 2 +- modules/tools/pom.xml | 8 +++--- pom.xml | 26 +++++++++---------- 37 files changed, 132 insertions(+), 132 deletions(-) diff --git a/modules/components/org.wso2.iot.core.admin.styles/pom.xml b/modules/components/org.wso2.iot.core.admin.styles/pom.xml index e7ef8e79..787b55a9 100644 --- a/modules/components/org.wso2.iot.core.admin.styles/pom.xml +++ b/modules/components/org.wso2.iot.core.admin.styles/pom.xml @@ -19,8 +19,8 @@ - org.wso2.iot - wso2iot-components + io.entgra.iot + entgra-iot-components 3.8.3-SNAPSHOT ../pom.xml @@ -28,8 +28,8 @@ 4.0.0 org.wso2.iot.core.admin.styles bundle - WSO2 IoT - UI Styles - http://wso2.org + Entgra IoT - UI Styles + http://entgra.io diff --git a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/product/about.html b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/product/about.html index d472d18b..300ff178 100644 --- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/product/about.html +++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/product/about.html @@ -18,24 +18,24 @@ - WSO2 IoT 1.0.0 + Entgra IoT 4.0.0 -

WSO2 IoT 1.0.0

+

Entgra IoT 4.0.0

With its modular, extensible, and customizable capabilities, - WSO2 Internet of Things Server (IoT Server) offers a complete, secure, + Entgra Internet of Things Server (IoT Server) offers a complete, secure, open source, enterprise-grade IoT device management solution. Built by re-using WSO2 middleware platform capabilities, - WSO2 IoT Server provides the server-side of IoT device management architecture for device manufacturers; - the extensibility of the underlying WSO2 Connected Device Management Framework enables WSO2 IoT Server + Entgra IoT Server provides the server-side of IoT device management architecture for device manufacturers; + the extensibility of the underlying WSO2 Connected Device Management Framework enables Entgra IoT Server to be extended to any device type and support other protocols and data formats. - Moreover, it’s in-built tooling capability allows developers to extend WSO2 IoT Server’s functionality. + Moreover, it’s in-built tooling capability allows developers to extend Entgra IoT Server’s functionality. It offers customizable and advanced IoT device analytics via WSO2 Data Analytics Server that include predictive analytics using machine learning capabilities. diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 83418c13..8ca7993c 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -21,17 +21,17 @@ - org.wso2.iot - wso2iot-parent + io.entgra.iot + entgra-iot-server-parent 3.8.3-SNAPSHOT ../../pom.xml 4.0.0 - wso2iot-components + entgra-iot-components pom - WSO2 IoT - Components Module - http://wso2.org + Entgra IoT - Components Module + http://entgra.io org.wso2.iot.core.admin.styles diff --git a/modules/cxf-filters/pom.xml b/modules/cxf-filters/pom.xml index a0133f76..97c6ddfa 100644 --- a/modules/cxf-filters/pom.xml +++ b/modules/cxf-filters/pom.xml @@ -17,8 +17,8 @@ - org.wso2.iot - wso2iot-parent + io.entgra.iot + entgra-iot-server-parent 3.8.3-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f3aa3386..cb603045 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -20,8 +20,8 @@ - org.wso2.iot - wso2iot-parent + io.entgra.iot + entgra-iot-server-parent 3.8.3-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 45a59d8f..ac918fd0 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1082,7 +1082,7 @@ - wso2iot-broker-${pom.version}/repository/lib + entgra-iot-broker-${pom.version}/repository/lib jline:jline:jar diff --git a/modules/distribution/src/core/bin/profile-creator.bat b/modules/distribution/src/core/bin/profile-creator.bat index 3d489084..8db91c21 100644 --- a/modules/distribution/src/core/bin/profile-creator.bat +++ b/modules/distribution/src/core/bin/profile-creator.bat @@ -23,7 +23,7 @@ set DISTRIBUTION=entgra-iot-@product.version@ REM get the desired profile echo This tool will erase all the files which are not required for the selected profile echo and provide you a light weight package for the target profile. -echo WSO2 IoT Server Supports following profiles. +echo Entgra IoT Server Supports following profiles. echo 1.IoT Device Backend Profile echo 2.IoT Device Manager Profile echo 3.IoT Key Manager Profile diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 575ca5cd..74736613 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. #------------------------------------------------------------------------- -# Profile creator tool for EI +# Profile creator tool for IoTS #------------------------------------------------------------------------- @@ -28,7 +28,7 @@ BINDIR=$(pwd) #get the desired profile echo "This tool will erase all the files which are not required for the selected profile " echo "and also creates a distribution of this profile in the same folder resides." -echo "WSO2 IoT Server Supports following profiles." +echo "Entgra IoT Server Supports following profiles." echo " 1.IoT Device Backend Profile" echo " 2.IoT Device Manager Profile" echo " 3.IoT Key Manager Profile" diff --git a/modules/distribution/src/core/conf/axis2/axis2.xml b/modules/distribution/src/core/conf/axis2/axis2.xml index 0327c780..dc7aaea2 100644 --- a/modules/distribution/src/core/conf/axis2/axis2.xml +++ b/modules/distribution/src/core/conf/axis2/axis2.xml @@ -58,8 +58,8 @@ axis2modules - WSO2 IoT 1.0.0 - WSO2 IoT 1.O.0 + Entgra IoT 1.0.0 + Entgra IoT 1.O.0 diff --git a/modules/distribution/src/core/jaggeryapps/privacy-policies/pages/cookie-policy.jag b/modules/distribution/src/core/jaggeryapps/privacy-policies/pages/cookie-policy.jag index 58185a17..10541aef 100755 --- a/modules/distribution/src/core/jaggeryapps/privacy-policies/pages/cookie-policy.jag +++ b/modules/distribution/src/core/jaggeryapps/privacy-policies/pages/cookie-policy.jag @@ -2,7 +2,7 @@ - WSO2 IoT Server + Entgra IoT Server @@ -37,19 +37,19 @@