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

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

@ -43,26 +43,27 @@
</definition>
</datasource>
<datasource>
<name>WSO2APPM_DB</name>
<description>The datasource used for App Manager database</description>
<jndiConfig>
<name>jdbc/WSO2APPM_DB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE</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>
</configuration>
</definition>
</datasource>
<!-- todo remove-->
<!-- <datasource>-->
<!-- <name>WSO2APPM_DB</name>-->
<!-- <description>The datasource used for App Manager database</description>-->
<!-- <jndiConfig>-->
<!-- <name>jdbc/WSO2APPM_DB</name>-->
<!-- </jndiConfig>-->
<!-- <definition type="RDBMS">-->
<!-- <configuration>-->
<!-- <url>jdbc:h2:repository/database/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE</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>-->
<!-- </configuration>-->
<!-- </definition>-->
<!-- </datasource>-->
<datasource>
<name>WSO2AM_DB</name>
@ -123,25 +124,26 @@
</configuration>
</definition>
</datasource>
<datasource>
<name>WSO2_SOCIAL_DB</name>
<description>The datasource used for Store social database</description>
<jndiConfig>
<name>jdbc/WSO2_SOCIAL_DB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE</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>
</configuration>
</definition>
</datasource>
<!-- todo remove-->
<!-- <datasource>-->
<!-- <name>WSO2_SOCIAL_DB</name>-->
<!-- <description>The datasource used for Store social database</description>-->
<!-- <jndiConfig>-->
<!-- <name>jdbc/WSO2_SOCIAL_DB</name>-->
<!-- </jndiConfig>-->
<!-- <definition type="RDBMS">-->
<!-- <configuration>-->
<!-- <url>jdbc:h2:repository/database/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE</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>-->
<!-- </configuration>-->
<!-- </definition>-->
<!-- </datasource>-->
</datasources>
</datasources-configuration>

Write Preview
Loading…
Cancel
Save