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

product/modules/agents/android/jax-rs/pom.xml

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

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

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

product/pom.xml

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