From 65433dda57763e93a63febe4293edc0595f39dbd Mon Sep 17 00:00:00 2001
From: Geeth Munasinghe <geeth@wso2.com>
Date: Wed, 10 Dec 2014 15:08:31 +0530
Subject: [PATCH] Fixing pom issues

---
 product/modules/agents/android/jax-rs/pom.xml     | 4 ++--
 product/modules/distribution/src/assembly/bin.xml | 4 ++--
 product/pom.xml                                   | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/product/modules/agents/android/jax-rs/pom.xml b/product/modules/agents/android/jax-rs/pom.xml
index 306d7c24dc..4277470498 100644
--- a/product/modules/agents/android/jax-rs/pom.xml
+++ b/product/modules/agents/android/jax-rs/pom.xml
@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
-        <artifactId>wso2cdmserver-parent</artifactId>
+        <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>
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index 2b569559c3..eee52239eb 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/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>
diff --git a/product/pom.xml b/product/pom.xml
index ecd5db07f4..c9fbafc3d0 100644
--- a/product/pom.xml
+++ b/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>