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

Prepare for entgra-iots-3.5.0-alpha

Browse Source
merge-requests/8/head
Charitha Goonetilleke 6 years ago
parent 3568c66fd1
commit e0f3f378ed
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

6
modules/distribution/pom.xml
Unescape View File

@ -27,10 +27,10 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot</artifactId> <artifactId>entgra-iot</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 IoT - Distribution</name> <name>Entgra IoT - Distribution</name>
<description>WSO2 IoT Distribution</description> <description>Entgra IoT Distribution</description>
<dependencies> <dependencies>
<dependency> <dependency>

4
modules/distribution/src/core/README
Unescape View File

@ -20,7 +20,7 @@ Installation & Running
Running the IoT server Running the IoT server
================================== ==================================
1. Extract wso2iot-@product.version@.zip and go to the extracted directory/bin. 1. Extract entgra-iot-@product.version@.zip and go to the extracted directory/bin.
2. Run iot-server.sh or iot-server.bat. 2. Run iot-server.sh or iot-server.bat.
3. Point your favourite browser to https://localhost:9443/devicemgt in order to see the available device types and operations. 3. Point your favourite browser to https://localhost:9443/devicemgt in order to see the available device types and operations.
4. Use the following username and password to login 4. Use the following username and password to login
@ -33,7 +33,7 @@ Running the IoT server
Running all runtimes (IoT, Analytics, Broker) Running all runtimes (IoT, Analytics, Broker)
================================================================== ==================================================================
1. Extract wso2iot-@product.version@.zip and go to the extracted directory/bin. 1. Extract entgra-iot-@product.version@.zip and go to the extracted directory/bin.
2. Run broker.sh (or broker.bat), then the iot-server.sh (iot-server.bat) and finally analytics.sh (or analytics.bat). 2. Run broker.sh (or broker.bat), then the iot-server.sh (iot-server.bat) and finally analytics.sh (or analytics.bat).
3. Access appropriate url for the related runtime. (For example, use https://localhost:9443/devicemgt for the IoT Server runtime) 3. Access appropriate url for the related runtime. (For example, use https://localhost:9443/devicemgt for the IoT Server runtime)

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

@ -19,7 +19,7 @@ REM Profile creator tool for EI
REM --------------------------------------------------------------------------- REM ---------------------------------------------------------------------------
set DIR=%~dp0 set DIR=%~dp0
set DISTRIBUTION=wso2iot-@product.version@ set DISTRIBUTION=entgra-iot-@product.version@
REM get the desired profile REM get the desired profile
echo This tool will erase all the files which are not required for the selected 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 and provide you a light weight package for the target profile.

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

@ -22,7 +22,7 @@
DIR="$(dirname "${BASH_SOURCE[0]}")" DIR="$(dirname "${BASH_SOURCE[0]}")"
DISTRIBUTION="wso2iot-@product.version@" DISTRIBUTION="entgra-iot-@product.version@"
ALLPROF=0 ALLPROF=0
BINDIR=$(pwd) BINDIR=$(pwd)
#get the desired profile #get the desired profile

2
modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java
Unescape View File

@ -146,7 +146,7 @@ public class CustomTestServerManager {
File[] carbonServerFiles = subFile.listFiles(); File[] carbonServerFiles = subFile.listFiles();
if (carbonServerFiles != null) { if (carbonServerFiles != null) {
for (File file : carbonServerFiles) { for (File file : carbonServerFiles) {
if (file.getName().startsWith("wso2iot")) { if (file.getName().startsWith("entgra-iot")) {
return file.getAbsolutePath(); return file.getAbsolutePath();
} }
} }

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

@ -57,7 +57,7 @@
<property> <property>
<name>carbon.zip</name> <name>carbon.zip</name>
<value> <value>
${basedir}/../../distribution/target/wso2iot-${project.version}.zip ${basedir}/../../distribution/target/entgra-iot-${project.version}.zip
</value> </value>
</property> </property>
<property> <property>
@ -125,7 +125,7 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot</artifactId> <artifactId>entgra-iot</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -165,7 +165,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/ ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/resources/security/
</directory> </directory>
<includes> <includes>
<include>**/*.jks</include> <include>**/*.jks</include>
@ -186,7 +186,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/ ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/resources/security/
</directory> </directory>
<includes> <includes>
<include>**/*.jks</include> <include>**/*.jks</include>
@ -207,7 +207,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/conf/axis2/ ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/conf/axis2/
</directory> </directory>
<includes> <includes>
<include>**/*.xml</include> <include>**/*.xml</include>
@ -228,7 +228,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/deployment/client/modules ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/deployment/client/modules
</directory> </directory>
<includes> <includes>
<include>**/*.mar</include> <include>**/*.mar</include>

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

@ -60,7 +60,7 @@
<property> <property>
<name>carbon.zip</name> <name>carbon.zip</name>
<value> <value>
${basedir}/../../distribution/target/wso2iot-${project.version}.zip ${basedir}/../../distribution/target/entgra-iot-${project.version}.zip
</value> </value>
</property> </property>
<property> <property>
@ -115,7 +115,7 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot</artifactId> <artifactId>entgra-iot</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -155,7 +155,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/ ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/resources/security/
</directory> </directory>
<includes> <includes>
<include>**/*.jks</include> <include>**/*.jks</include>
@ -176,7 +176,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/ ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/resources/security/
</directory> </directory>
<includes> <includes>
<include>**/*.jks</include> <include>**/*.jks</include>
@ -197,7 +197,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/conf/axis2/ ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/conf/axis2/
</directory> </directory>
<includes> <includes>
<include>**/*.xml</include> <include>**/*.xml</include>
@ -218,7 +218,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/deployment/client/modules ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/deployment/client/modules
</directory> </directory>
<includes> <includes>
<include>**/*.mar</include> <include>**/*.mar</include>

6
pom.xml
Unescape View File

@ -1528,14 +1528,14 @@
<carbon.governance.version>4.7.23</carbon.governance.version> <carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>3.2.2-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>3.2.2</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.2.2-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.2.2</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.2.201</carbon.api.mgt.version> <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>
@ -1640,7 +1640,7 @@
<caramel.version>1.0.1</caramel.version> <caramel.version>1.0.1</caramel.version>
<!-- App manager version--> <!-- App manager version-->
<appmgt.feature.version>1.5.2</appmgt.feature.version> <appmgt.feature.version>1.5.3</appmgt.feature.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->
<carbon.store.version>1.5.1</carbon.store.version> <carbon.store.version>1.5.1</carbon.store.version>

Write Preview
Loading…
Cancel
Save