community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pom issues for 4.0.0 release

Browse Source
merge-requests/64/head
Charitha Goonetilleke 5 years ago
parent d9eca966a1
commit 87a6bd894f
37 changed files with 132 additions and 132 deletions
Show Stats Download Patch File Download Diff File

8
modules/components/org.wso2.iot.core.admin.styles/pom.xml
Unescape View File

@ -19,8 +19,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-components</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-components</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -28,8 +28,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.iot.core.admin.styles</artifactId>
<packaging>bundle</packaging>
<name>WSO2 IoT - UI Styles</name>
<url>http://wso2.org</url>
<name>Entgra IoT - UI Styles</name>
<url>http://entgra.io</url>
<build>
<plugins>

12
modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/product/about.html
Unescape View File

@ -18,24 +18,24 @@
<html>
<head>
<meta http-equiv="content-type" content=""/>
<title>WSO2 IoT 1.0.0</title>
<title>Entgra IoT 4.0.0</title>
<link href="./tools/cmd/css/gs-dist-doc.css" rel="stylesheet"
type="text/css" media="all"/>
</head>
<body>
<h1>WSO2 IoT 1.0.0</h1>
<h1>Entgra IoT 4.0.0</h1>
<p>
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.

10
modules/components/pom.xml
Unescape View File

@ -21,17 +21,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-server-parent</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-components</artifactId>
<artifactId>entgra-iot-components</artifactId>
<packaging>pom</packaging>
<name>WSO2 IoT - Components Module</name>
<url>http://wso2.org</url>
<name>Entgra IoT - Components Module</name>
<url>http://entgra.io</url>
<modules>
<module>org.wso2.iot.core.admin.styles</module>

4
modules/cxf-filters/pom.xml
Unescape View File

@ -17,8 +17,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-server-parent</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

4
modules/distribution/pom.xml
Unescape View File

@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-server-parent</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -1082,7 +1082,7 @@
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>wso2iot-broker-${pom.version}/repository/lib</outputDirectory>
<outputDirectory>entgra-iot-broker-${pom.version}/repository/lib</outputDirectory>
<includes>
<include>jline:jline:jar</include>
</includes>

2
modules/distribution/src/core/bin/profile-creator.bat
Unescape View File

@ -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

4
modules/distribution/src/core/bin/profile-creator.sh
Unescape View File

@ -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 <IOT_HOME> 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"

4
modules/distribution/src/core/conf/axis2/axis2.xml
Unescape View File

@ -58,8 +58,8 @@
<parameter name="ModulesDirectory">axis2modules</parameter>
<!-- User agent and the server details to be used in the http communication -->
<parameter name="userAgent" locked="true">WSO2 IoT 1.0.0</parameter>
<parameter name="server" locked="true">WSO2 IoT 1.O.0</parameter>
<parameter name="userAgent" locked="true">Entgra IoT 1.0.0</parameter>
<parameter name="server" locked="true">Entgra IoT 1.O.0</parameter>
<!-- During a fault, stacktrace can be sent with the fault message. The following flag -->
<!-- will control that behaviour -->

12
modules/distribution/src/core/jaggeryapps/privacy-policies/pages/cookie-policy.jag
Unescape View File

@ -2,7 +2,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>WSO2 IoT Server</title>
<title>Entgra IoT Server</title>
<link rel="icon" href="images/favicon.png" type="image/x-icon"/>
<link href="libs/bootstrap_3.3.5/css/bootstrap.min.css" rel="stylesheet">
@ -37,19 +37,19 @@
<div class="container col-xs-12 col-sm-12 col-md-12 col-lg-12 col-centered wr-content wr-login col-centered padding-bottom-100">
<div>
<h2 class="wr-title uppercase blue-bg padding-double white boarder-bottom-blue margin-none">
WSO2 IoT Server - Cookie Policy
Entgra IoT Server - Cookie Policy
</h2>
</div>
<div class="boarder-all ">
<div class="clearfix"></div>
<!-- Customizable content. Due to this nature, i18n is not implemented for this section -->
<div id="cookiePolicy" class="padding-double">
<h4><a href="https://wso2.com/iot/"><strong>About WSO2 IoT Server</strong></a></h4>
<p>WSO2 IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner.
<h4><a href="https://wso2.com/iot/"><strong>About Entgra IoT Server</strong></a></h4>
<p>Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner.
<p>It also offers a complete and secure enterprise mobility management (EMM/MDM) solution that aims to address mobile computing challenges faced by enterprises today. Supporting iOS, Android, and Windows devices, it helps organizations deal with both corporate owned, personally enabled (COPE) and employee-owned devices with the bring your own device (BYOD) concept.</p>
<p>WSO2 IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state.</p>
<p>Entgra IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state.</p>
<div class="margin-bottom-double"></div>
<h2 id="cookie-policy"><strong>Cookie Policy</strong></h2>
<p>IoT Server uses cookies to provide you with the best user experience, and to securely identify you. You might not be able to access some of the services if you disable cookies.</p>
@ -170,7 +170,7 @@
<!-- footer -->
<footer class="footer">
<div class="container-fluid">
<p>WSO2 IoT Server | &copy;
<p>Entgra IoT Server | &copy;
<script>document.write(new Date().getFullYear());</script>
<a href="http://wso2.com/" target="_blank"><i class="icon fw fw-wso2"></i> Inc</a>. All rights reserved
</p>

4
modules/distribution/src/core/jaggeryapps/privacy-policies/pages/privacy-policy.jag
Unescape View File

@ -2,7 +2,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>WSO2 IoT Server</title>
<title>Entgra IoT Server</title>
<link rel="icon" href="images/favicon.png" type="image/x-icon"/>
<link href="libs/bootstrap_3.3.5/css/bootstrap.min.css" rel="stylesheet">
@ -57,7 +57,7 @@
<!-- footer -->
<footer class="footer">
<div class="container-fluid">
<p>WSO2 IoT Server | &copy;
<p>Entgra IoT Server | &copy;
<script>document.write(new Date().getFullYear());</script>
<a href="http://wso2.com/" target="_blank"><i class="icon fw fw-wso2"></i> Inc</a>. All rights reserved
</p>

14
modules/distribution/src/core/release-notes.html
Unescape View File

@ -8,14 +8,14 @@
<a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
<h1>Release Note - Entgra IoT Server Version 3.8.0</h1>
<h1>Release Note - Entgra IoT Server Version 4.0.0</h1>
<h2>We are pleased to announce Entgra IoT Server 3.8.0.</h2>
<h2>We are pleased to announce Entgra IoT Server 4.0.0.</h2>
<p>Entgra IoT Server is the successor of WSO2 IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 3.8.0 pays special focus to Kiosk devices and many other EMM improvements.
<p>Entgra IoT Server is the successor of Entgra IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 3.8.0 pays special focus to Kiosk devices and many other EMM improvements.
</p>
<h4>What's new in Entgra IoTS 3.8.0</h4>
<h4>What's new in Entgra IoTS 4.0.0</h4>
<ul>
<li>Windows PC support added to the platform</li>
@ -46,7 +46,7 @@ The known set of issues this version can be found <a href='https://gitlab.com/en
<p>Join our mailing list and correspondence with the developers directly.</p>
<p>Developer list: <a href="mailto:dev@entgra.org">dev@entgra.org</a></p>
<p>Developer list: <a href="mailto:dev@entgra.org">dev@entgra.io</a></p>
<h4>Reporting Issues</h4>
@ -55,9 +55,9 @@ The known set of issues this version can be found <a href='https://gitlab.com/en
<h4>Discussion Forums</h4>
<p>We encourage you to use stackoverflow for
<a href="http://stackoverflow.com/questions/tagged/wso2iots%20or%20wso2emm%20or%20entgraiot%20or%20wso2-emm">IoT
<a href="http://stackoverflow.com/questions/tagged/entgra-iots%20or%20wso2emm%20or%20entgraiot%20or%20wso2-emm">IoT
</a> and <a
href="http://stackoverflow.com/questions/tagged/wso2iots%20or%20wso2emm%20or%20entgraemm%20or%20wso2-emm">EMM</a> to engage with developers as well as other users.</p>
href="http://stackoverflow.com/questions/tagged/entgra-iots%20or%20wso2emm%20or%20entgraemm%20or%20wso2-emm">EMM</a> to engage with developers as well as other users.</p>
<p>For more information about Entgra IoT Server, please see <a href="https://www.entgra.io/">https://www.entgra.io</a></p>

12
modules/features/org.wso2.iot.core.styles.feature/pom.xml
Unescape View File

@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-features</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-features</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -29,12 +29,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.iot.core.styles.feature</artifactId>
<packaging>pom</packaging>
<name>WSO2 IoT - Styles Feature</name>
<url>http://wso2.org</url>
<name>Entgra IoT - Styles Feature</name>
<url>http://entgra.io</url>
<dependencies>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.core.admin.styles</artifactId>
</dependency>
</dependencies>
@ -62,7 +62,7 @@
</properties>
</adviceFile>
<bundles>
<bundleDef>org.wso2.iot:org.wso2.iot.core.admin.styles</bundleDef>
<bundleDef>io.entgra.iot:org.wso2.iot.core.admin.styles</bundleDef>
</bundles>
<importBundles />
<importFeatures />

10
modules/features/pom.xml
Unescape View File

@ -21,17 +21,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-server-parent</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-features</artifactId>
<artifactId>entgra-iot-features</artifactId>
<packaging>pom</packaging>
<name>WSO2 IoT - Features Module</name>
<url>http://wso2.org</url>
<name>Entgra IoT - Features Module</name>
<url>http://entgra.io</url>
<modules>
<module>org.wso2.iot.core.styles.feature</module>

10
modules/integration/pom.xml
Unescape View File

@ -19,17 +19,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-server-parent</artifactId>
<version>3.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-integration</artifactId>
<artifactId>entgra-iot-integration</artifactId>
<packaging>pom</packaging>
<name>WSO2 IoT - Integration Module</name>
<url>http://wso2.org</url>
<name>Entgra IoT - Integration Module</name>
<url>http://entgra.io</url>
<modules>
<module>tests-common</module>

4
modules/integration/tests-common/integration-common/pom.xml
Unescape View File

@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>tests-common</artifactId>
<version>3.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.iot.integration.common</artifactId>
<packaging>jar</packaging>
<name>WSO2 IoT - Integration Common</name>
<name>Entgra IoT - Integration Common</name>
<dependencies>
<dependency>

6
modules/integration/tests-common/pom.xml
Unescape View File

@ -19,8 +19,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-integration</artifactId>
<version>3.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tests-common</artifactId>
<packaging>pom</packaging>
<name>WSO2 IoT - Integration Test Common</name>
<name>Entgra IoT - Integration Test Common</name>
<modules>
<module>integration-common</module>

4
modules/integration/tests-common/web-ui-pages/pom.xml
Unescape View File

@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>tests-common</artifactId>
<version>3.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
<packaging>jar</packaging>
<name>WSO2 IoT - Integration Test Common Web UI Pages</name>
<name>Entgra IoT - Integration Test Common Web UI Pages</name>
<dependencies>
<dependency>

6
modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties
Unescape View File

@ -24,9 +24,9 @@ cdmf.error.page=Error | CDMF
cdmf.user.home.page=Device Management | CDMF
cdmf.groups.page=Group Management | CDMF
cdmf.user.add.page=User Management | Add User | CDMF
cdmf.policy.page=Policy Management | WSO2 IoT Server
cdmf.policy.add.page=Policy Management | Add Policy | WSO2 IoT Server
cdmf.policy.view.page=Policy Management | View Policy | WSO2 IoT Server
cdmf.policy.page=Policy Management | Entgra IoT Server
cdmf.policy.add.page=Policy Management | Add Policy | Entgra IoT Server
cdmf.policy.view.page=Policy Management | View Policy | Entgra IoT Server
# User registration and login details-----------------------------------------------------------------------------------

8
modules/integration/tests-integration/pom.xml
Unescape View File

@ -18,8 +18,8 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-integration</artifactId>
<version>3.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -124,7 +124,7 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot</artifactId>
<version>${project.version}</version>
<type>zip</type>
@ -260,7 +260,7 @@
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.carbon.iot.integration.common</artifactId>
</dependency>
<dependency>

12
modules/integration/tests-iot-web-ui/pom.xml
Unescape View File

@ -18,14 +18,14 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-integration</artifactId>
<version>3.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>WSO2 IoT - Integration Test UI Module</name>
<name>Entgra IoT - Integration Test UI Module</name>
<artifactId>org.wso2.carbon.iot.integration.test.web.ui.integration</artifactId>
<packaging>jar</packaging>
@ -114,7 +114,7 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot</artifactId>
<version>${project.version}</version>
<type>zip</type>
@ -234,7 +234,7 @@
<dependencies>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
<!--<version>${product.iot.version}</version>-->
</dependency>
@ -251,7 +251,7 @@
<artifactId>org.wso2.carbon.integration.common.extensions</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.carbon.iot.integration.common</artifactId>
</dependency>
</dependencies>

8
modules/p2-profile/analytics-profile/pom.xml
Unescape View File

@ -19,15 +19,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-p2-profile</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-p2-profile</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-analytics-p2-profile</artifactId>
<name>WSO2 IoT - Analytics P2 Profile Gen</name>
<artifactId>entgra-iot-analytics-p2-profile</artifactId>
<name>Entgra IoT - Analytics P2 Profile Gen</name>
<packaging>pom</packaging>
<build>

8
modules/p2-profile/broker-profile/pom.xml
Unescape View File

@ -18,16 +18,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-p2-profile</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-p2-profile</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-broker-p2-profile</artifactId>
<artifactId>entgra-iot-broker-p2-profile</artifactId>
<packaging>pom</packaging>
<name>WSO2 IoT - Broker P2 Profile Gen</name>
<name>Entgra IoT - Broker P2 Profile Gen</name>
<url>http://wso2.com/products/message-broker/</url>
<build>

10
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -20,15 +20,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-p2-profile</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-p2-profile</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-core-p2-profile</artifactId>
<name>WSO2 IoT - Core P2 Profile Gen</name>
<artifactId>entgra-iot-core-p2-profile</artifactId>
<name>Entgra IoT - Core P2 Profile Gen</name>
<packaging>pom</packaging>
<build>
@ -438,7 +438,7 @@
<!-- IoT Server Features -->
<featureArtifactDef>
org.wso2.iot:org.wso2.iot.core.styles.feature:${project.version}
io.entgra.iot:org.wso2.iot.core.styles.feature:${project.version}
</featureArtifactDef>
<!-- App Manager Features-->

10
modules/p2-profile/pom.xml
Unescape View File

@ -21,17 +21,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-server-parent</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-p2-profile</artifactId>
<artifactId>entgra-iot-p2-profile</artifactId>
<packaging>pom</packaging>
<name>WSO2 IoT - P2 Profile Module</name>
<url>http://wso2.org</url>
<name>Entgra IoT - P2 Profile Module</name>
<url>http://entgra.io</url>
<modules>
<module>iot-core-profile</module>

6
modules/scripts/mobile-qsg/pom.xml
Unescape View File

@ -19,8 +19,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-scripts</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-scripts</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>mobile-qsg</artifactId>
<version>3.8.3-SNAPSHOT</version>
<name>WSO2 IoT - QSG Script</name>
<name>Entgra IoT - QSG Script</name>
<description>This includes the tools for IoTs Quick Start Guide</description>
<packaging>jar</packaging>

4
modules/scripts/mobile-qsg/resources/Readme.txt
Unescape View File

@ -1,8 +1,8 @@
WSO2 IoTs 3.8.0 QSG Setup Guide
Entgra IoTs 4.0.0 QSG Setup Guide
---------------------------------
1. Start the WSO2 IoTS server
1. Start the Entgra IoTS server
2. Navigate to <IoTS_HOME>/core/samples/mobile-qsg/ directory using the terminal.
3. Once server is started execute the mobile-qsg.sh script
4. There will be two users getting created once you ran the script with user name 'chris' and 'alex'.

4
modules/scripts/mobile-qsg/resources/mobile-qsg.sh
Unescape View File

@ -1,6 +1,6 @@
#!/bin/bash
# product-iots qsg sample setup script
echo "Starting wso2iots-3.0.0 QSG setup ..."
echo "Starting entgra-iots-4.0.0 QSG setup ..."
java -jar "mobile-qsg.jar"
echo "wso2iots-3.0.0 QSG setup completed."
echo "entgra-iots-4.0.0 QSG setup completed."

8
modules/scripts/pom.xml
Unescape View File

@ -19,16 +19,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-server-parent</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-scripts</artifactId>
<artifactId>entgra-iot-scripts</artifactId>
<packaging>pom</packaging>
<name>WSO2 IoT - Scripts</name>
<name>Entgra IoT - Scripts</name>
<url>http://maven.apache.org</url>
<modules>

8
modules/tools/cdmf-devicetype-archetype/pom.xml
Unescape View File

@ -18,8 +18,8 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-tools</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-tools</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -27,8 +27,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>iot-devicetype-archetype</artifactId>
<version>3.8.3-SNAPSHOT</version>
<name>WSO2 IoT - Device Type Archetype</name>
<description>WSO2 IoT Device Type Archetype</description>
<name>Entgra IoT - Device Type Archetype</name>
<description>Entgra IoT Device Type Archetype</description>
<packaging>maven-archetype</packaging>
<organization>
<name>WSO2 Inc.</name>

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml
Unescape View File

@ -28,7 +28,7 @@
<version>${version}</version>
<packaging>pom</packaging>
<name> ${artifactId} </name>
<url>http://wso2.org</url>
<url>http://entgra.io</url>
<build>
<plugins>
<plugin>

4
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/WEB-INF/web.xml
Unescape View File

@ -4,8 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
metadata-complete="true">
<display-name>WSO2 IoT Server</display-name>
<description>WSO2 IoT Server</description>
<display-name>Entgra IoT Server</display-name>
<description>Entgra IoT Server</description>
<servlet>
<servlet-name>CXFServlet</servlet-name>

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml
Unescape View File

@ -31,7 +31,7 @@
<artifactId>${project-base-package}.plugin</artifactId>
<packaging>bundle</packaging>
<name>${project-base-package}.plugin</name>
<url>http://wso2.org</url>
<url>http://entgra.io</url>
<build>
<plugins>
<plugin>

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/type-view.hbs
Unescape View File

@ -14,7 +14,7 @@
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
<h3 class="uppercase">What it Does</h3>
<hr>
<p class="grey margin-top">Connect a ${deviceType} to WSO2 IoT Server and manage it.</p>
<p class="grey margin-top">Connect a ${deviceType} to Entgra IoT Server and manage it.</p>
<p>Add brief description what this device type does</p>
<h3 class="uppercase">What You Need</h3>
<p>Add hardware requirement which will be required to make this device type </p>

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
Unescape View File

@ -28,7 +28,7 @@
<artifactId>${project-base-package}.feature</artifactId>
<packaging>pom</packaging>
<name>${project-base-package}.feature </name>
<url>http://wso2.org</url>
<url>http://entgra.io</url>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>

8
modules/tools/pom.xml
Unescape View File

@ -19,16 +19,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<groupId>io.entgra.iot</groupId>
<artifactId>entgra-iot-server-parent</artifactId>
<version>3.8.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-tools</artifactId>
<artifactId>entgra-iot-tools</artifactId>
<packaging>pom</packaging>
<name>WSO2 IoT - Tools</name>
<name>Entgra IoT - Tools</name>
<url>http://maven.apache.org</url>
<modules>

26
pom.xml
Unescape View File

@ -25,7 +25,7 @@
<packaging>pom</packaging>
<version>3.8.3-SNAPSHOT</version>
<name>Entgra IoT - Parent</name>
<url>http://wso2.org</url>
<url>http://entgra.io</url>
<description>Entgra IoT Server</description>
<parent>
@ -876,7 +876,7 @@
<version>${google.gson.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.carbon.iot.integration.common</artifactId>
<version>${project.version}</version>
</dependency>
@ -947,13 +947,13 @@
<version>${eclipse.paho.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.core.admin.styles</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
<version>${project.version}</version>
</dependency>
@ -1018,17 +1018,17 @@
<version>2.0.0.v200706191603</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.analytics.styles</artifactId>
<version>${product.iot.analytics.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.analytics.multitenancy.styles</artifactId>
<version>${product.iot.analytics.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.analytics.multitenancy.dashboard.ui</artifactId>
<version>${product.iot.analytics.version}</version>
</dependency>
@ -1036,12 +1036,12 @@
<!-- START - Integration test dependencies -->
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.analytics.integration.common.utils</artifactId>
<version>${product.iot.analytics.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.analytics.integration.common.clients</artifactId>
<version>${product.iot.analytics.version}</version>
</dependency>
@ -1216,23 +1216,23 @@
<version>${servlet-api.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.broker.styles</artifactId>
<version>${product.iot.broker.version}</version>
</dependency>
<!--Dependencies for integration tests -->
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.broker.integration.common.clients</artifactId>
<version>${product.iot.broker.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.broker.integration.common.utils</artifactId>
<version>${product.iot.broker.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<groupId>io.entgra.iot</groupId>
<artifactId>org.wso2.iot.broker.platform.common.utils</artifactId>
<version>${product.iot.broker.version}</version>
</dependency>

Write Preview
Loading…
Cancel
Save