community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ruwany/product-iots into latest-master

Browse Source
This commit is contained in:
Milan Perera 2017-01-05 10:05:33 +05:30
commit 1f172a65ee
33 changed files with 306 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/analytics/distribution/datasource_config_change.xml Normal file
View File

@ -0,0 +1,12 @@
<processor>
<!-- Remove current datsources config -->
<remove>
<name>//datasources-configuration/datasources</name>
</remove>
<!-- Add modified Carbon db and UM db config -->
<add>
<inside>//datasources-configuration</inside>
<file>ds_config.xml</file>
</add>
</processor>

46
modules/analytics/distribution/ds_config.xml Normal file
View File

@ -0,0 +1,46 @@
<config>
<datasources>
<datasource>
<name>WSO2_CARBON_DB</name>
<description>The datasource used for registry and user manager</description>
<jndiConfig>
<name>jdbc/WSO2CarbonDB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
<defaultAutoCommit>false</defaultAutoCommit>
</configuration>
</definition>
</datasource>
<datasource>
<name>WSO2_UM_DB</name>
<description>The datasource used for registry and user manager</description>
<jndiConfig>
<name>jdbc/WSO2UMDB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:../core/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
<defaultAutoCommit>false</defaultAutoCommit>
</configuration>
</definition>
</datasource>
</datasources>
</config>

26
modules/analytics/distribution/pom.xml
View File

@ -80,6 +80,31 @@
</executions>
</plugin>
<plugin>
<groupId>com.google.code.maven-config-processor-plugin</groupId>
<artifactId>config-processor-maven-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>change_datasource_config</id>
<phase>package</phase>
<goals>
<goal>process</goal>
</goals>
<configuration>
<failOnMissingXpath>true</failOnMissingXpath>
<transformations>
<transformation>
<input>${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/master-datasources.xml</input>
<output>../../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/master-datasources.xml</output>
<config>datasource_config_change.xml</config>
</transformation>
</transformations>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@ -117,6 +142,7 @@
<!-- commenting "GetAllRolesOfUserEnabled" property to fix
https://wso2.org/jira/browse/IDENTITY-3489 -->
<replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
<replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;dataSource&quot;&gt;jdbc/WSO2CarbonDB&lt;/Property&gt;" value="&lt;Property name=&quot;dataSource&quot;&gt;jdbc/WSO2UMDB&lt;/Property&gt;" />
<!-- Move IS UI to configure menu -->
<property name="tempdir2" value="target/identity-ui" />
<mkdir dir="${tempdir2}" />

9
modules/analytics/distribution/src/assembly/bin.xml
View File

@ -40,6 +40,7 @@
<exclude>**/release-notes.html</exclude>
<exclude>**/carbon.xml</exclude>
<exclude>**/axis2/axis2.xml</exclude>
<exclude>**/master-datasources.xml</exclude>
<exclude>**/log4j.properties</exclude>
<exclude>**/wso2server.sh</exclude> <!--adding a custom DAS server.sh file-->
<exclude>**/registry.xml</exclude>
@ -824,5 +825,13 @@
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/master-datasources.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
</files>
</assembly>

42
modules/core/distribution/pom.xml
View File

@ -79,7 +79,7 @@
<artifactItem>
<groupId>org.wso2.carbon</groupId>
<artifactId>wso2carbon-core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>target</outputDirectory>
@ -105,7 +105,7 @@
<tasks>
<echo message="########### Create Device Management H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
@ -115,7 +115,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/cdm/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
@ -132,7 +132,7 @@
<tasks>
<echo message="########### Create Certificate Management H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
@ -141,7 +141,7 @@
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/certMgt/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/certMgt/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
@ -158,7 +158,7 @@
<tasks>
<echo message="########### Create API Management H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE" />
@ -168,7 +168,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/apimgt/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
@ -186,7 +186,7 @@
<tasks>
<echo message="########### Create App Management H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE" />
@ -196,7 +196,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/appmgt/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
@ -214,7 +214,7 @@
<tasks>
<echo message="########### Create JAGH2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" />
@ -225,7 +225,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage/h2/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/storage/h2/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
@ -243,7 +243,7 @@
<tasks>
<echo message="########### Create Social Plugin H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE" />
@ -253,7 +253,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/social/h2/resource.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
@ -281,7 +281,7 @@
<include name="${project.artifactId}-${project.version}.zip" />
</fileset>
</unzip>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" overwrite="true">
<copy todir="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components" overwrite="true">
<fileset dir="${tempdir}/${project.artifactId}-${project.version}/repository/components" />
</copy>
<!--testing -->
@ -299,7 +299,7 @@ d <exclude name="**/shindig.properties" /
</delete>
<copy file="src/repository/resources/shindig/index.jsp" todir="target/shindig" />-->
<concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/log4j.properties">
<concat destfile="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/log4j.properties">
log4j.logger.net.sf.ehcache=ERROR
</concat>
@ -314,7 +314,7 @@ d <exclude name="**/shindig.properties" /
<phase>package</phase>
<configuration>
<tasks>
<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps" />
<mkdir dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/webapps" />
</tasks>
</configuration>
<goals>
@ -331,8 +331,8 @@ d <exclude name="**/shindig.properties" /
<delete dir="target/archive-tmp" />
<delete dir="target/dependency-maven-plugin-markers" />
<delete dir="target/maven-archiver" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}" />
<delete file="target/${project.artifactId}-${project.version}.jar" />
<delete dir="target/sources" />
<delete dir="target/site" />
@ -351,7 +351,7 @@ d <exclude name="**/shindig.properties" /
<phase>prepare-package</phase>
<configuration>
<tasks>
<replace token="PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
<replace token="PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/">
<include name="entitlement.properties" />
</replace>
</tasks>
@ -426,7 +426,7 @@ d <exclude name="**/shindig.properties" /
</goals>
<configuration>
<file>
${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/api-manager.xml
${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/api-manager.xml
</file>
<replacements>
<replacement>
@ -445,7 +445,7 @@ d <exclude name="**/shindig.properties" /
</goals>
<configuration>
<file>
${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
</file>
<replacements>
<replacement>

144
modules/core/distribution/src/assembly/bin.xml
View File

@ -48,7 +48,7 @@
<fileSets>
<fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
<directory>target/wso2carbon-core-${carbon.kernel.version.iotcore}</directory>
<outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
<excludes>
<exclude>**/*.sh</exclude>
@ -120,7 +120,7 @@
<!-- Copying Runtimes-->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/lib/runtimes
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/lib/runtimes/</outputDirectory>
<includes>
@ -128,7 +128,7 @@
</includes>
</fileSet>
<fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
<directory>target/wso2carbon-core-${carbon.kernel.version.iotcore}</directory>
<outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
<includes>
<include>**/*.sh</include>
@ -143,7 +143,7 @@
<!-- Multi-tenancy related file -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/multitenancy/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy
</outputDirectory>
@ -157,7 +157,7 @@
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/multitenancy/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<includes>
@ -190,7 +190,7 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/modules
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
<includes>
@ -228,7 +228,7 @@
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/security
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security
</outputDirectory>
@ -254,7 +254,7 @@
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/datasources
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources
</outputDirectory>
@ -264,7 +264,7 @@
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/device-types
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/device-types
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/device-types
</outputDirectory>
@ -288,7 +288,7 @@
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/service-provider
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/service-provider</outputDirectory>
<includes>
@ -298,7 +298,7 @@
<!-- Copying API management related dbscripts -->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt</directory>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/apimgt</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/apimgt</outputDirectory>
<includes>
<include>*/**</include>
@ -306,14 +306,14 @@
</fileSet>
<!-- Copying APP management related dbscripts -->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage</directory>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/storage</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/storage</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt</directory>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/appmgt</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/appmgt</outputDirectory>
<includes>
<include>*/**</include>
@ -323,7 +323,7 @@
<!-- Copying Certificate management related dbscripts -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/certMgt
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/certMgt
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/certMgt</outputDirectory>
<includes>
@ -332,7 +332,7 @@
</fileSet>
<!-- Copying Social plugin related dbscripts -->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social</directory>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/social</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/social</outputDirectory>
<includes>
<include>*/**</include>
@ -356,7 +356,7 @@
</fileSet>
<!--Copying modules-->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules</directory>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/modules</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
<includes>
<include>*/**</include>
@ -382,7 +382,7 @@
<!--Copying modules-->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/modules
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
<includes>
@ -400,7 +400,7 @@
<!-- Copying Device Management related dbscripts -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/cdm
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/cdm</outputDirectory>
<includes>
@ -408,13 +408,13 @@
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps</directory>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/carbonapps</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps
</outputDirectory>
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/resources
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources
</outputDirectory>
@ -436,7 +436,7 @@
<!-- Copying Authentication Endpoint webapp -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/webapps
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
</outputDirectory>
@ -450,7 +450,7 @@
<!-- Copying mdm app from devicemgt app-->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/devicemgt/
</directory>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
@ -458,7 +458,7 @@
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/
</directory>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
@ -466,7 +466,7 @@
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/uuf-template-app/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/uuf-template-app/
</directory>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
@ -475,7 +475,7 @@
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/webapps/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/
</outputDirectory>
@ -491,7 +491,7 @@
<!-- Copying APP Manager Publisher and Store Jaggery apps -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/publisher/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/publisher/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher
</outputDirectory>
@ -505,7 +505,7 @@
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/store/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/store/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store
</outputDirectory>
@ -521,7 +521,7 @@
<!-- Copying API Manager Store Jaggery app -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/api-store/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-store
</outputDirectory>
@ -552,7 +552,7 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/social/</directory>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/social/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social</outputDirectory>
</fileSet>
@ -577,7 +577,7 @@
<!-- Copying RXTs corresponding API management related components -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/rxts
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/rxts
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/rxts
</outputDirectory>
@ -585,7 +585,7 @@
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
</outputDirectory>
@ -606,7 +606,7 @@
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-providers
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/identity-providers
</directory>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers
@ -617,7 +617,7 @@
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/service-providers
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/service-providers
</directory>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/conf/identity/service-providers
@ -631,7 +631,7 @@
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/metrics/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/metrics/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/metrics</outputDirectory>
<includes>
@ -643,7 +643,7 @@
<!--QPID related configurations-->
<!--fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/advanced/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/advanced</outputDirectory>
<includes>
@ -657,7 +657,7 @@
<!-- Dashboard portal Jaggery app. Should be copied to <DAS_HOME>/repository/deployment/server/jaggeryapps -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/portal
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/portal
</directory>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal
@ -772,14 +772,14 @@
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/event-broker.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/registry-event-broker.xml
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/registry-event-broker.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
@ -810,13 +810,13 @@
<fileMode>644</fileMode>
</file>
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
<source>target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/README.txt</source>
<outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
<source>target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/version.txt</source>
<outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
@ -824,7 +824,7 @@
<!-- Copying logging-config.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/logging-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
@ -839,13 +839,13 @@
<fileMode>644</fileMode>
</file>
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
<source>target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/README</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/oidc-scope-config.xml</source>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/oidc-scope-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
@ -885,7 +885,7 @@
<!-- Copying governance.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/governance.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<fileMode>644</fileMode>
@ -911,7 +911,7 @@
</file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/tomcat/webapp-classloading.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat
</outputDirectory>
@ -932,7 +932,7 @@
<!--certificate config file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/certificate-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/certificate-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
@ -940,31 +940,31 @@
</file>
<!--Metrics-->
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties</source>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/metrics.properties</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<filtered>false</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.xml</source>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/metrics.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<filtered>false</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml</source>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/datasources/metrics-datasources.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db</source>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2METRICS_DB.h2.db</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- nTask Component -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/tasks-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>
<fileMode>644</fileMode>
@ -994,7 +994,7 @@
<!--Webapp Authenticator Config file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-authenticator-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/webapp-authenticator-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
@ -1013,7 +1013,7 @@
<!-- Copying email-sender-config.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/email-sender-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/email-sender-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
@ -1022,7 +1022,7 @@
<!--cdm plugin config file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/tomcat/webapp-classloading-environments.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat
</outputDirectory>
@ -1031,7 +1031,7 @@
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/claim-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/
</outputDirectory>
@ -1041,7 +1041,7 @@
<!-- Copying H2 database related files corresponding to default API management repository schema -->
<file>
<source>
target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2AM_DB.h2.db
target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2AM_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>WSO2AM_DB.h2.db</destName>
@ -1050,7 +1050,7 @@
<!-- Copying H2 database related files corresponding to default App management repository schema -->
<file>
<source>
target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2APPM_DB.h2.db
target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2APPM_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>WSO2APPM_DB.h2.db</destName>
@ -1059,7 +1059,7 @@
<!-- Copying H2 database related files corresponding to default Device management repository schema -->
<file>
<source>
target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2DM_DB.h2.db
target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2DM_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>WSO2DM_DB.h2.db</destName>
@ -1076,7 +1076,7 @@
<!-- Copying axis2-client.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/axis2/axis2_client.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/axis2/axis2_client.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2
</outputDirectory>
@ -1111,21 +1111,21 @@
<!-- Cipher Tool Files -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/ciphertool.sh
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/ciphertool.sh
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/bin</outputDirectory>
<fileMode>755</fileMode>
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/ciphertool.bat
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/ciphertool.bat
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/bin</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/org.wso2.ciphertool-${cipher.tool.version}.jar
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/lib/org.wso2.ciphertool-${cipher.tool.version}.jar
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
<fileMode>644</fileMode>
@ -1134,7 +1134,7 @@
<!--DAS Files-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/output-event-adapters.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
</outputDirectory>
@ -1143,7 +1143,7 @@
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/input-event-adapters.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/input-event-adapters.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
</outputDirectory>
@ -1152,7 +1152,7 @@
</file>
<!-- ************* Data bridge related files ********** -->
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml</source>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/data-bridge/data-bridge-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
@ -1163,7 +1163,7 @@
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-agent-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/data-bridge/data-agent-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge
</outputDirectory>
@ -1183,7 +1183,7 @@
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/jwt.properties
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/jwt.properties
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
@ -1191,7 +1191,7 @@
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/websocket-validation.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/websocket-validation.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
@ -1199,7 +1199,7 @@
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-analytics-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/device-analytics-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
@ -1215,7 +1215,7 @@
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml</source>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/social.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
@ -1233,7 +1233,7 @@
<!-- Copying devi-appmanager-config.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/remote-appmanager-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/remote-appmanager-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
@ -1242,7 +1242,7 @@
<!-- Adding IoT Analytics Dashboard and gadget CApps -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/</outputDirectory>
<fileMode>644</fileMode>

2
modules/core/distribution/src/assembly/dist.xml
View File

@ -25,7 +25,7 @@
<fileSets>
<!-- Copying p2 profile and osgi bundles-->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components</outputDirectory>
<excludes>
<exclude>**/eclipse.ini</exclude>

2
modules/core/distribution/src/repository/conf/datasources/master-datasources.xml
View File

@ -30,7 +30,7 @@
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>

2
modules/core/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml
View File

@ -168,7 +168,7 @@
</properties>
</adviceFile>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

8
modules/core/distribution/src/samples/connectedcup/pom.xml
View File

@ -65,7 +65,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -143,7 +143,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -208,7 +208,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
@ -363,7 +363,7 @@
<properties>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
<!-- Carbon Device Management -->
<carbon.device.mgt.version>1.2.6-SNAPSHOT</carbon.device.mgt.version>

2
modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml
View File

@ -207,7 +207,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

6
modules/core/distribution/src/samples/connectedlap/pom.xml
View File

@ -56,7 +56,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -131,7 +131,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -196,7 +196,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>

2
modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml
View File

@ -197,7 +197,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

16
modules/core/distribution/src/samples/currentsensor/pom.xml
View File

@ -82,7 +82,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -173,10 +173,10 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<scope>system</scope>
<systemPath>
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version}.jar
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version.iotcore}.jar
</systemPath>
</dependency>
<dependency>
@ -245,7 +245,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
@ -306,7 +306,7 @@
</exclusions>
<scope>system</scope>
<systemPath>
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version}.jar
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version.iotcore}.jar
</systemPath>
</dependency>
<dependency>
@ -375,17 +375,17 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.api</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<scope>system</scope>
<systemPath>
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version}.jar
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version.iotcore}.jar
</systemPath>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
<!-- Carbon Device Management -->
<carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>

2
modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml
View File

@ -194,7 +194,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

16
modules/core/distribution/src/samples/digitaldisplay/pom.xml
View File

@ -81,7 +81,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -183,10 +183,10 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<scope>system</scope>
<systemPath>
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version}.jar
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version.iotcore}.jar
</systemPath>
</dependency>
<dependency>
@ -255,7 +255,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
@ -316,7 +316,7 @@
</exclusions>
<scope>system</scope>
<systemPath>
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version}.jar
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version.iotcore}.jar
</systemPath>
</dependency>
<dependency>
@ -385,10 +385,10 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.api</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<scope>system</scope>
<systemPath>
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version}.jar
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version.iotcore}.jar
</systemPath>
</dependency>
</dependencies>
@ -460,7 +460,7 @@
<properties>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
<!-- Carbon Device Management -->
<carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>

2
modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml
View File

@ -193,7 +193,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

12
modules/core/distribution/src/samples/doormanager/pom.xml
View File

@ -56,7 +56,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -131,7 +131,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -196,17 +196,17 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.api</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
@ -394,7 +394,7 @@
<carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.commons.version>4.4.8</carbon.commons.version>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
<carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
<org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>

2
modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml
View File

@ -193,7 +193,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

8
modules/core/distribution/src/samples/droneanalyzer/pom.xml
View File

@ -56,7 +56,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -131,7 +131,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -196,7 +196,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
@ -384,7 +384,7 @@
<carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.commons.version>4.4.8</carbon.commons.version>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
<carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
<org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>

2
modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml
View File

@ -193,7 +193,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

8
modules/core/distribution/src/samples/firealarm/pom.xml
View File

@ -56,7 +56,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -131,7 +131,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -196,7 +196,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
@ -384,7 +384,7 @@
<carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.commons.version>4.4.8</carbon.commons.version>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
<carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
<org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>

2
modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml
View File

@ -194,7 +194,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

8
modules/core/distribution/src/samples/geolocationTracker/pom.xml
View File

@ -56,7 +56,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -131,7 +131,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -196,7 +196,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
@ -384,7 +384,7 @@
<carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.commons.version>4.4.8</carbon.commons.version>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
<carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
<org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>

2
modules/core/distribution/src/samples/watertank/feature/feature/pom.xml
View File

@ -193,7 +193,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

8
modules/core/distribution/src/samples/watertank/pom.xml
View File

@ -57,7 +57,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -132,7 +132,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -197,7 +197,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
@ -375,7 +375,7 @@
<carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.commons.version>4.4.8</carbon.commons.version>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
<carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
<org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>

2
modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
View File

@ -68,7 +68,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}</importFeatureDef>
</importFeatures>
</configuration>
</execution>

4
modules/core/p2-profile-gen/carbon.product
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.10" useFeatures="true" includeLaunchers="true">
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.11" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@ -13,7 +13,7 @@
</plugins>
<features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.10"/>
<feature id="org.wso2.carbon.core.runtime" version="4.4.11"/>
</features>
<configurations>

83
modules/core/p2-profile-gen/pom.xml
View File

@ -49,7 +49,7 @@
<artifactItem>
<groupId>org.wso2.carbon</groupId>
<artifactId>wso2carbon-core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>target</outputDirectory>
@ -345,10 +345,7 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.inbound.metadata.saml2.server.feature:0.1.1
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:0.1.3
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version}
</featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity.framework:org.wso2.carbon.identity.base:${carbon.identity.framework.version.iotcore}-->
@ -514,13 +511,13 @@
<!--********************************************-->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version}
org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version.iotcore}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version}
org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version.iotcore}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version}
org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version.iotcore}
</featureArtifactDef>
<!-- Carbon Commons Features -->
@ -718,7 +715,7 @@
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<targetPath>
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
</targetPath>
<profile>http-gateway</profile>
</configuration>
@ -734,7 +731,7 @@
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<targetPath>
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
</targetPath>
<profile>device-key-manager</profile>
</configuration>
@ -750,7 +747,7 @@
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<targetPath>
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
</targetPath>
<profile>devicetype-publisher</profile>
</configuration>
@ -766,7 +763,7 @@
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<targetPath>
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
</targetPath>
<profile>devicetype-worker</profile>
</configuration>
@ -782,18 +779,14 @@
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
<!-- IoTServer Features -->
<feature>
<id>org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group</id>
<version>0.1.1</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.sp.metadata.saml2.server.feature.group</id>
<version>0.1.3</version>
<version>${identity.metadata.saml2.version}</version>
</feature>
<feature>
<id>org.wso2.iot.core.styles.feature.group</id>
@ -1291,15 +1284,15 @@
<!--********************************************-->
<feature>
<id>org.wso2.carbon.core.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.runtime.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.ui.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<!-- Carbon Deployment Features -->
@ -1487,7 +1480,7 @@
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
@ -1527,15 +1520,15 @@
</feature>
<feature>
<id>org.wso2.carbon.core.common.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.server.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.runtime.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.ntask.core.feature.group</id>
@ -1857,7 +1850,7 @@
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
@ -1899,7 +1892,7 @@
</feature>
<feature>
<id>org.wso2.carbon.core.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.apache.axis2.transport.mail.feature.group</id>
@ -1952,7 +1945,7 @@
</feature>
<feature>
<id>org.wso2.carbon.core.common.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.application.mgt.server.feature.group</id>
@ -1960,11 +1953,11 @@
</feature>
<feature>
<id>org.wso2.carbon.core.server.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.runtime.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.ntask.core.feature.group</id>
@ -2303,7 +2296,7 @@
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
@ -2438,7 +2431,7 @@
</feature>
<feature>
<id>org.wso2.carbon.core.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.apache.axis2.transport.mail.feature.group</id>
@ -2458,7 +2451,7 @@
</feature>
<feature>
<id>org.wso2.carbon.core.common.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.user.mgt.feature.group</id>
@ -2470,19 +2463,19 @@
</feature>
<feature>
<id>org.wso2.carbon.core.server.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.runtime.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.ui.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
@ -2895,7 +2888,7 @@
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
@ -3021,7 +3014,7 @@
</feature>
<feature>
<id>org.wso2.carbon.core.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.apache.axis2.transport.mail.feature.group</id>
@ -3041,7 +3034,7 @@
</feature>
<feature>
<id>org.wso2.carbon.core.common.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.user.mgt.feature.group</id>
@ -3053,19 +3046,19 @@
</feature>
<feature>
<id>org.wso2.carbon.core.server.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.runtime.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.core.ui.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
@ -3457,7 +3450,7 @@
<phase>package</phase>
<configuration>
<tasks>
<replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components">
<replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components">
<include name="**/bundles.info" />
</replace>
</tasks>

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

@ -193,7 +193,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
</importFeatureDef>

8
modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
View File

@ -56,7 +56,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
@ -131,7 +131,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -196,7 +196,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<version>${carbon.kernel.version.iotcore}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
@ -380,7 +380,7 @@
<!-- Carbon Device Management -->
<carbon.devicemgt.version>1.1.0-SNAPSHOT</carbon.devicemgt.version>
<carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
<carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.jar.version>1.1.0.SNAPSHOT</carbon.device.mgt.jar.version>
<carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>

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

@ -96,6 +96,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<exclusions>
<exclusion>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-android-driver</artifactId>
</exclusion>
</exclusions>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>

13
pom.xml
View File

@ -1453,6 +1453,7 @@
<properties>
<!--Carbon kernel versions-->
<carbon.kernel.version.iotcore>4.4.11</carbon.kernel.version.iotcore>
<carbon.kernel.version>4.4.10</carbon.kernel.version>
<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
@ -1496,23 +1497,23 @@
<!-- Carbon Identity -->
<carbon.identity.framework.version>5.2.0</carbon.identity.framework.version>
<carbon.identity.framework.version.iotcore>5.6.89</carbon.identity.framework.version.iotcore>
<carbon.identity.framework.version.iotcore>5.7.0</carbon.identity.framework.version.iotcore>
<carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range>
<identity.local.auth.basicauth.version>5.1.1</identity.local.auth.basicauth.version>
<identity.local.auth.basicauth.version.iotcore>5.2.4</identity.local.auth.basicauth.version.iotcore>
<identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version>
<identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>
<identity.inbound.auth.saml.version.iotcore>5.2.14</identity.inbound.auth.saml.version.iotcore>
<identity.inbound.auth.saml.version.iotcore>5.3.0</identity.inbound.auth.saml.version.iotcore>
<identity.carbon.auth.saml2.version>5.1.3</identity.carbon.auth.saml2.version>
<identity.carbon.auth.saml2.version.iotcore>5.1.6</identity.carbon.auth.saml2.version.iotcore>
<identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
<identity.inbound.auth.oauth.version.iotcore>5.2.33</identity.inbound.auth.oauth.version.iotcore>
<identity.inbound.auth.oauth.version.iotcore>5.3.0</identity.inbound.auth.oauth.version.iotcore>
<identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version>
<identity.user.ws.version>5.1.3</identity.user.ws.version>
<identity.outbound.auth.requestpath.basicauth.version>5.1.1</identity.outbound.auth.requestpath.basicauth.version>
<identity.outbound.auth.requestpath.oauth.version>5.1.1</identity.outbound.auth.requestpath.oauth.version>
<identity.outbound.auth.samlsso.version>5.1.4</identity.outbound.auth.samlsso.version>
<identity.metadata.saml2>0.1.3</identity.metadata.saml2>
<identity.metadata.saml2.version>1.0.0</identity.metadata.saml2.version>
<!--JWT grant type extension feature-->
<identity.jwt.extension.version>1.0.2</identity.jwt.extension.version>
@ -1537,8 +1538,8 @@
<carbon.device.mgt.plugin.version>3.0.5-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.1.2</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(5.0.0,7.0.0]</carbon.api.mgt.version.range>
<carbon.api.mgt.version>6.1.20-SNAPSHOT</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Mediation -->
<carbon.mediation.version>4.6.9</carbon.mediation.version>