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 pull request #4 from ruwany/geethkokila-330-release-new

Browse Source 
resolving issues with consent management
This commit is contained in:
Geeth 2018-03-14 09:22:22 +05:30 committed by GitHub
commit f1153c9194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
modules/distribution/pom.xml
View File

@ -148,6 +148,26 @@
</replacements> </replacements>
</configuration> </configuration>
</execution> </execution>
<!-- Replace Consent Mgt Datasource Confgs -->
<execution>
<id>replace-for-consent</id>
<phase>package</phase>
<goals>
<goal>replace</goal>
</goals>
<configuration>
<file>${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/consent-mgt-config.xml</file>
<replacements>
<replacement>
<xpath>/ConsentManager/DataSource/Name</xpath>
<token>(jdbc/WSO2CarbonDB)</token>
<value>jdbc/WSO2AM_DB</value>
</replacement>
</replacements>
</configuration>
</execution>
<!-- Replace Datasource, Scope mpl classes and OAuth callback class in identity.xml --> <!-- Replace Datasource, Scope mpl classes and OAuth callback class in identity.xml -->
<!-- Replace the Datasource in the thrift-authentication.xml file --> <!-- Replace the Datasource in the thrift-authentication.xml file -->
@ -450,7 +470,33 @@
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
<execution>
<!-- Creating API Management schema -->
<id>create-user-consent-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create User Consent H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/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" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/consent/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution>
<execution> <execution>
<!-- Creating App Management schema --> <!-- Creating App Management schema -->
<id>create-app-mgt-schema</id> <id>create-app-mgt-schema</id>

4
pom.xml
View File

@ -1525,14 +1525,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.1.3</carbon.device.mgt.version> <carbon.device.mgt.version>3.1.3-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.0.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.1.0</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.2.170</carbon.api.mgt.version> <carbon.api.mgt.version>6.2.170</carbon.api.mgt.version>