changing bin.xml to fix duplicate files in pack

merge-requests/1/head
Ace 9 years ago
parent b4e9b84536
commit 57da4fb9c4

@ -225,13 +225,6 @@
</fileSet> </fileSet>
<fileSet>
<directory>src/repository/resources</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<fileSet> <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
@ -291,13 +284,13 @@
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <!--fileSet>
<directory>src/repository/modules/sso</directory> <directory>src/repository/modules/sso</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/modules/sso</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/modules/sso</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet-->
<!-- Copying Device Management related dbscripts --> <!-- Copying Device Management related dbscripts -->
<fileSet> <fileSet>
@ -307,13 +300,6 @@
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources
</outputDirectory>
</fileSet>
<fileSet> <fileSet>
<directory>src/statistics/carbonapps/</directory> <directory>src/statistics/carbonapps/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps
@ -440,10 +426,10 @@
<!--These files are already provided in the CDMF-Store feature too. --> <!--These files are already provided in the CDMF-Store feature too. -->
<!--However, given that the order of feature installation cannot be controlled, they are recopied at the product level.--> <!--However, given that the order of feature installation cannot be controlled, they are recopied at the product level.-->
<fileSet> <!-- <fileSet>
<directory>src/publisher/config</directory> <directory>src/publisher/config</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher/config</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher/config</outputDirectory>
</fileSet> </fileSet> -->
<!--========================================================================================================--> <!--========================================================================================================-->
<!-- End of Enterprise Store Features --> <!-- End of Enterprise Store Features -->
@ -624,14 +610,14 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <!--file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file-->
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xsd ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xsd
@ -715,33 +701,33 @@
</file> </file>
<!-- Copying application-authentication.xml --> <!-- Copying application-authentication.xml -->
<file> <!-- <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file> -->
<file> <!-- <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/msg-mgt.properties ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/msg-mgt.properties
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file> -->
<!-- Copying thrift-authentication.xml --> <!-- Copying thrift-authentication.xml -->
<file> <!-- <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/thrift-authentication.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/thrift-authentication.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file> -->
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source> <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
@ -936,15 +922,15 @@
<!-- End of Enterprise Store Features --> <!-- End of Enterprise Store Features -->
<!-- Copying apim feature - bam.xml --> <!-- Copying apim feature - bam.xml -->
<file> <!--file-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml--> <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml-->
<source> <!--source>
src/repository/conf/etc/bam.xml src/repository/conf/etc/bam.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file-->
<!-- Analytics datasources --> <!-- Analytics datasources -->
<file> <file>

Loading…
Cancel
Save