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

Comment unused wso2 appm related jagerry file copying

Browse Source
merge-requests/11/head
lasanthaDLPDS 6 years ago
parent 757c530285
commit c83049f4c4
2 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File

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

@ -451,16 +451,16 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <!-- <fileSet>-->
<directory> <!-- <directory>-->
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/social/ <!-- ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/social/-->
</directory> <!-- </directory>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social <!-- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social-->
</outputDirectory> <!-- </outputDirectory>-->
<excludes> <!-- <excludes>-->
<exclude>**/jaggery.conf</exclude> <!-- <exclude>**/jaggery.conf</exclude>-->
</excludes> <!-- </excludes>-->
</fileSet> <!-- </fileSet>-->
<!-- Copying Android Mutual SSL and Windows Synapse files --> <!-- Copying Android Mutual SSL and Windows Synapse files -->
<fileSet> <fileSet>
@ -1610,13 +1610,13 @@
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file> </file>
<file> <!-- <file>-->
<source>src/core/jaggeryapps/social/jaggery.conf</source> <!-- <source>src/core/jaggeryapps/social/jaggery.conf</source>-->
<outputDirectory> <!-- <outputDirectory>-->
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social/ <!-- ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social/-->
</outputDirectory> <!-- </outputDirectory>-->
<fileMode>755</fileMode> <!-- <fileMode>755</fileMode>-->
</file> <!-- </file>-->
<!--<file>--> <!--<file>-->
<!--<source>src/core/jaggeryapps/store/jaggery.conf</source>--> <!--<source>src/core/jaggeryapps/store/jaggery.conf</source>-->
<!--<outputDirectory>--> <!--<outputDirectory>-->

82
modules/distribution/src/core/conf/datasources/master-datasources.xml
Unescape View File

@ -43,26 +43,27 @@
</definition> </definition>
</datasource> </datasource>
<datasource> <!-- todo remove-->
<name>WSO2APPM_DB</name> <!-- <datasource>-->
<description>The datasource used for App Manager database</description> <!-- <name>WSO2APPM_DB</name>-->
<jndiConfig> <!-- <description>The datasource used for App Manager database</description>-->
<name>jdbc/WSO2APPM_DB</name> <!-- <jndiConfig>-->
</jndiConfig> <!-- <name>jdbc/WSO2APPM_DB</name>-->
<definition type="RDBMS"> <!-- </jndiConfig>-->
<configuration> <!-- <definition type="RDBMS">-->
<url>jdbc:h2:repository/database/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE</url> <!-- <configuration>-->
<username>wso2carbon</username> <!-- <url>jdbc:h2:repository/database/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE</url>-->
<password>wso2carbon</password> <!-- <username>wso2carbon</username>-->
<driverClassName>org.h2.Driver</driverClassName> <!-- <password>wso2carbon</password>-->
<maxActive>50</maxActive> <!-- <driverClassName>org.h2.Driver</driverClassName>-->
<maxWait>60000</maxWait> <!-- <maxActive>50</maxActive>-->
<testOnBorrow>true</testOnBorrow> <!-- <maxWait>60000</maxWait>-->
<validationQuery>SELECT 1</validationQuery> <!-- <testOnBorrow>true</testOnBorrow>-->
<validationInterval>30000</validationInterval> <!-- <validationQuery>SELECT 1</validationQuery>-->
</configuration> <!-- <validationInterval>30000</validationInterval>-->
</definition> <!-- </configuration>-->
</datasource> <!-- </definition>-->
<!-- </datasource>-->
<datasource> <datasource>
<name>WSO2AM_DB</name> <name>WSO2AM_DB</name>
@ -123,25 +124,26 @@
</configuration> </configuration>
</definition> </definition>
</datasource> </datasource>
<datasource> <!-- todo remove-->
<name>WSO2_SOCIAL_DB</name> <!-- <datasource>-->
<description>The datasource used for Store social database</description> <!-- <name>WSO2_SOCIAL_DB</name>-->
<jndiConfig> <!-- <description>The datasource used for Store social database</description>-->
<name>jdbc/WSO2_SOCIAL_DB</name> <!-- <jndiConfig>-->
</jndiConfig> <!-- <name>jdbc/WSO2_SOCIAL_DB</name>-->
<definition type="RDBMS"> <!-- </jndiConfig>-->
<configuration> <!-- <definition type="RDBMS">-->
<url>jdbc:h2:repository/database/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE</url> <!-- <configuration>-->
<username>wso2carbon</username> <!-- <url>jdbc:h2:repository/database/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE</url>-->
<password>wso2carbon</password> <!-- <username>wso2carbon</username>-->
<driverClassName>org.h2.Driver</driverClassName> <!-- <password>wso2carbon</password>-->
<maxActive>50</maxActive> <!-- <driverClassName>org.h2.Driver</driverClassName>-->
<maxWait>60000</maxWait> <!-- <maxActive>50</maxActive>-->
<testOnBorrow>true</testOnBorrow> <!-- <maxWait>60000</maxWait>-->
<validationQuery>SELECT 1</validationQuery> <!-- <testOnBorrow>true</testOnBorrow>-->
<validationInterval>30000</validationInterval> <!-- <validationQuery>SELECT 1</validationQuery>-->
</configuration> <!-- <validationInterval>30000</validationInterval>-->
</definition> <!-- </configuration>-->
</datasource> <!-- </definition>-->
<!-- </datasource>-->
</datasources> </datasources>
</datasources-configuration> </datasources-configuration>

Write Preview
Loading…
Cancel
Save