community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/geethkokila/product-cdm

Browse Source
This commit is contained in:
harshanL 2014-12-10 15:32:39 +05:30
commit ac484d06fa
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
product/modules/agents/android/jax-rs/pom.xml
View File

@ -19,8 +19,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../../../../../pom.xml</relativePath> <relativePath>../../../../../pom.xml</relativePath>
</parent> </parent>
@ -47,7 +47,7 @@
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.2</version> <version>2.2</version>
<configuration> <configuration>
<!--<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>--> <packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes>
<warName>${project.artifactId}</warName> <warName>${project.artifactId}</warName>
</configuration> </configuration>
</plugin> </plugin>

4
product/modules/distribution/src/assembly/bin.xml
View File

@ -323,12 +323,12 @@
<outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>
<file> <!--<file>
<source>src/repository/conf/axis2/axis2.xml</source> <source>src/repository/conf/axis2/axis2.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/axis2/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/axis2/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>-->
<file> <file>
<source>src/repository/conf/application-authenticators.xml</source> <source>src/repository/conf/application-authenticators.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>

1
product/pom.xml
View File

@ -34,6 +34,7 @@
<name>WSO2 Connected Device Manager (CDM) - Parent</name> <name>WSO2 Connected Device Manager (CDM) - Parent</name>
<modules> <modules>
<!--<module>modules/agents/android/jax-rs</module>-->
<module>modules/p2-profile-gen</module> <module>modules/p2-profile-gen</module>
<module>modules/distribution</module> <module>modules/distribution</module>
<module>modules/integration</module> <module>modules/integration</module>