Fixing cdm-config file adding

merge-requests/7/head
Geeth Munasinghe 10 years ago
parent 5db7698627
commit 14a3429a19

@ -0,0 +1,3 @@
instructions.configure = \
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/cdm-config.xml,target:${installFolder}/../../conf/cdm-config.xml,overwrite:true);\

@ -153,7 +153,7 @@
<includes>
<include>**/api-manager.xml</include>
<include>**/sso-idp-config.xml</include>
<include>**/emm-config.xml</include>
<!-- <include>**/emm-config.xml</include>-->
</includes>
</fileSet>
<fileSet>
@ -358,6 +358,16 @@
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!--cdm config file-->
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>

@ -107,7 +107,7 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version}
</featureArtifactDef>
<featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version}
</featureArtifactDef>
<featureArtifactDef>
@ -164,7 +164,7 @@
<id>org.wso2.carbon.device.mgt.server.feature.group</id>
<version>${project.version}</version>
</feature>
<feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
<version>${project.version}</version>
</feature>

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

Loading…
Cancel
Save