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

.gitignore

@@ -10,14 +10,3 @@ target
 
 # Mac crap
 .DS_Store
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf

@@ -1,3 +1,4 @@
 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);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/dbscripts/cdm,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/rxts/license.rxt,target:${installFolder}/../../../repository/resources/rxts/license.rxt,overwrite:true);\

product/modules/distribution/src/assembly/bin.xml

@@ -126,14 +126,6 @@
                 <include>**/trusted-idp-config.xml</include>
             </includes>
         </fileSet>
-
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/rxts/
-            </directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/resources/rxts/</outputDirectory>
-        </fileSet>
-
         <fileSet>
             <directory>src/repository/conf/datasources</directory>
             <outputDirectory>wso2cdm-${project.version}/repository/conf/datasources