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

Merge branch 'master' into 'master'

Browse Source 
Bug fixes and appmgt package name change

See merge request entgra/community-product!3
merge-requests/4/merge
Pahansith Gunathilake 3 years ago
parent 27c9b8caa7 a085445de5
commit 7509184892
1 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File

56
iot-core/pom.xml
Unescape View File

@ -87,6 +87,54 @@
</target>
</configuration>
</execution>
<execution>
<id>update-dbscripts</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target name="replace dbscripts to avoid tenant creation issue ">
<replace file="target/${wso2am}/dbscripts/db2.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000),"/>
<replace file="target/${wso2am}/dbscripts/h2.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000),"/>
<replace file="target/${wso2am}/dbscripts/informix.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000),"/>
<replace file="target/${wso2am}/dbscripts/mssql.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000),"/>
<replace file="target/${wso2am}/dbscripts/mysql.sql" token="REG_VALUE VARCHAR(1000),," value="REG_VALUE VARCHAR(10000),,"/>
<replace file="target/${wso2am}/dbscripts/mysql_cluster.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000),"/>
<replace file="target/${wso2am}/dbscripts/oracle.sql" token="REG_VALUE VARCHAR2(1000)," value="REG_VALUE VARCHAR2(10000),"/>
<replace file="target/${wso2am}/dbscripts/oracle.sql" token="REG_VALUE VARCHAR2(1000)," value="REG_VALUE VARCHAR2(10000),"/>
<replace file="target/${wso2am}/dbscripts/oracle_rac.sql" token="REG_VALUE VARCHAR2(1000)," value="REG_VALUE VARCHAR2(10000),"/>
<replace file="target/${wso2am}/dbscripts/postgresql.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000),"/>
</target>
</configuration>
</execution>
<execution>
<!--Alter shared h2 db -->
<id>alter-shared-h2-db</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<delete file="${basedir}/target/${wso2am}/repository/database/WSO2SHARED_DB.mv.db"/>
<echo message="########### Create Device Management H2 Schema ###########" />
<property name="db.dir" value="target/${wso2am}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/target/${wso2am}/dbscripts/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</target>
</configuration>
</execution>
<execution>
<!--Creating Device Management schema-->
<id>create-device-mgt-schema</id>
@ -228,10 +276,10 @@
<!-- App Manager Features-->
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}
org.wso2.carbon.devicemgt:io.entgra.application.mgt.api.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}
org.wso2.carbon.devicemgt:io.entgra.application.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- End of New App Manager Features-->
</featureArtifacts>
@ -262,11 +310,11 @@
<!--App Manager Features-->
<feature>
<id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<id>io.entgra.application.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
<id>io.entgra.application.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!--End of App Manager Features-->