From b5433373717bade4af04f0352cb5a91c882545cb Mon Sep 17 00:00:00 2001
From: harshanL <harshan@wso2.com>
Date: Mon, 2 Feb 2015 10:51:18 +0530
Subject: [PATCH] MDM-299 fix

---
 pom.xml                                       | 25 ++++++++++++++-----
 .../mdm}/mobileservices/android/Device.java   |  8 +++---
 .../mobileservices/android/Enrollment.java    |  8 +++---
 .../mobileservices/android/Operation.java     |  9 ++++---
 .../android/common/AndroidAgentException.java |  2 +-
 .../android/common/ErrorHandler.java          |  2 +-
 .../android/common/ErrorMessage.java          |  2 +-
 .../android/util/AndroidAPIUtils.java         |  2 +-
 .../android/util/AndroidConstants.java        |  2 +-
 .../mobileservices/android/util/Message.java  |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   |  8 +++---
 11 files changed, 42 insertions(+), 28 deletions(-)
 rename product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/{cdmserver => carbon/mdm}/mobileservices/android/Device.java (95%)
 rename product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/{cdmserver => carbon/mdm}/mobileservices/android/Enrollment.java (95%)
 rename product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/{cdmserver => carbon/mdm}/mobileservices/android/Operation.java (93%)
 rename product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/{cdmserver => carbon/mdm}/mobileservices/android/common/AndroidAgentException.java (96%)
 rename product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/{cdmserver => carbon/mdm}/mobileservices/android/common/ErrorHandler.java (95%)
 rename product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/{cdmserver => carbon/mdm}/mobileservices/android/common/ErrorMessage.java (94%)
 rename product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/{cdmserver => carbon/mdm}/mobileservices/android/util/AndroidAPIUtils.java (98%)
 rename product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/{cdmserver => carbon/mdm}/mobileservices/android/util/AndroidConstants.java (96%)
 rename product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/{cdmserver => carbon/mdm}/mobileservices/android/util/Message.java (95%)

diff --git a/pom.xml b/pom.xml
index 008b50163..9282161b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -490,32 +490,32 @@
             <dependency>
                 <groupId>org.apache.wss4j</groupId>
                 <artifactId>wss4j-ws-security-common</artifactId>
-                <version>2.0.0</version>
+                <version>${apache.wss4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcpkix-jdk15on</artifactId>
-                <version>1.49</version>
+                <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>1.49</version>
+                <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-utils</artifactId>
-                <version>3.0.21</version>
+                <version>${codehaus.plexus.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.madgag.spongycastle</groupId>
                 <artifactId>pkix</artifactId>
-                <version>1.51.0.0</version>
+                <version>${spongycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-ws-security</artifactId>
-                <version>2.6.1</version>
+                <version>${cxf.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -606,6 +606,19 @@
         <!-- API Management -->
         <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
 
+        <!-- Spongycastle Management-->
+        <spongycastle.version>1.51.0.0</spongycastle.version>
+
+        <!-- Bouncycastle Management-->
+        <bouncycastle.version>1.49</bouncycastle.version>
+
+        <!-- Apache wss4j Management-->
+        <apache.wss4j.version>2.0.0</apache.wss4j.version>
+
+        <!-- Codehaus Plexus Management-->
+        <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
+
+
     </properties>
 
     <scm>
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Device.java
similarity index 95%
rename from product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java
rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Device.java
index 20af913ff..c9e36472b 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Device.java
@@ -15,12 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.cdmserver.mobileservices.android;
+package org.wso2.carbon.mdm.mobileservices.android;
 
 import org.wso2.carbon.device.mgt.common.*;
-import org.wso2.cdmserver.mobileservices.android.common.AndroidAgentException;
-import org.wso2.cdmserver.mobileservices.android.util.AndroidAPIUtils;
-import org.wso2.cdmserver.mobileservices.android.util.Message;
+import org.wso2.carbon.mdm.mobileservices.android.util.AndroidAPIUtils;
+import org.wso2.carbon.mdm.mobileservices.android.util.Message;
+import org.wso2.carbon.mdm.mobileservices.android.common.AndroidAgentException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Enrollment.java
similarity index 95%
rename from product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java
rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Enrollment.java
index d2e2438f8..64579d696 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Enrollment.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.cdmserver.mobileservices.android;
+package org.wso2.carbon.mdm.mobileservices.android;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,9 +24,9 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManagementServiceException;
-import org.wso2.cdmserver.mobileservices.android.common.AndroidAgentException;
-import org.wso2.cdmserver.mobileservices.android.util.AndroidAPIUtils;
-import org.wso2.cdmserver.mobileservices.android.util.Message;
+import org.wso2.carbon.mdm.mobileservices.android.common.AndroidAgentException;
+import org.wso2.carbon.mdm.mobileservices.android.util.AndroidAPIUtils;
+import org.wso2.carbon.mdm.mobileservices.android.util.Message;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Operation.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Operation.java
similarity index 93%
rename from product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Operation.java
rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Operation.java
index 83891c7f4..217a4116a 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Operation.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Operation.java
@@ -17,16 +17,17 @@
  * under the License.
  */
 
-package org.wso2.cdmserver.mobileservices.android;
+package org.wso2.carbon.mdm.mobileservices.android;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.*;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
-import org.wso2.cdmserver.mobileservices.android.common.AndroidAgentException;
-import org.wso2.cdmserver.mobileservices.android.util.AndroidAPIUtils;
-import org.wso2.cdmserver.mobileservices.android.util.Message;
+import org.wso2.carbon.mdm.mobileservices.android.common.AndroidAgentException;
+import org.wso2.carbon.mdm.mobileservices.android.util.AndroidAPIUtils;
+import org.wso2.carbon.mdm.mobileservices.android.util.Message;
+
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import java.util.List;
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/AndroidAgentException.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/AndroidAgentException.java
similarity index 96%
rename from product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/AndroidAgentException.java
rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/AndroidAgentException.java
index ed5bf6736..77a8774a6 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/AndroidAgentException.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/AndroidAgentException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.cdmserver.mobileservices.android.common;
+package org.wso2.carbon.mdm.mobileservices.android.common;
 
 public class AndroidAgentException extends Exception{
 
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorHandler.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/ErrorHandler.java
similarity index 95%
rename from product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorHandler.java
rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/ErrorHandler.java
index a15316026..e40faaa36 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorHandler.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/ErrorHandler.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.cdmserver.mobileservices.android.common;
+package org.wso2.carbon.mdm.mobileservices.android.common;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorMessage.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/ErrorMessage.java
similarity index 94%
rename from product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorMessage.java
rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/ErrorMessage.java
index 171b708e3..44095d396 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorMessage.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/ErrorMessage.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.cdmserver.mobileservices.android.common;
+package org.wso2.carbon.mdm.mobileservices.android.common;
 
 
 public class ErrorMessage {
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/AndroidAPIUtils.java
similarity index 98%
rename from product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java
rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/AndroidAPIUtils.java
index accd7ffc3..0fa6f31de 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/AndroidAPIUtils.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.cdmserver.mobileservices.android.util;
+package org.wso2.carbon.mdm.mobileservices.android.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidConstants.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/AndroidConstants.java
similarity index 96%
rename from product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidConstants.java
rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/AndroidConstants.java
index 5554839c7..da6812273 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidConstants.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/AndroidConstants.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.cdmserver.mobileservices.android.util;
+package org.wso2.carbon.mdm.mobileservices.android.util;
 
 /**
  * Defines constants used in Android-REST API bundle.
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/Message.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/Message.java
similarity index 95%
rename from product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/Message.java
rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/Message.java
index 974043a53..65259f7dc 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/Message.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/Message.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.cdmserver.mobileservices.android.util;
+package org.wso2.carbon.mdm.mobileservices.android.util;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml b/product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
index 5b0c46836..749f98936 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -51,10 +51,10 @@
         </jaxrs:providers>
     </jaxrs:server>
 
-    <bean id="deviceMgtServiceBean" class="org.wso2.cdmserver.mobileservices.android.Device"/>
-    <bean id="enrollmentServiceBean" class="org.wso2.cdmserver.mobileservices.android.Enrollment"/>
-    <bean id="operationServiceBean" class="org.wso2.cdmserver.mobileservices.android.Operation"/>
+    <bean id="deviceMgtServiceBean" class="org.wso2.carbon.mdm.mobileservices.android.Device"/>
+    <bean id="enrollmentServiceBean" class="org.wso2.carbon.mdm.mobileservices.android.Enrollment"/>
+    <bean id="operationServiceBean" class="org.wso2.carbon.mdm.mobileservices.android.Operation"/>
     <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
-    <bean id="errorHandler" class="org.wso2.cdmserver.mobileservices.android.common.ErrorHandler"/>
+    <bean id="errorHandler" class="org.wso2.carbon.mdm.mobileservices.android.common.ErrorHandler"/>
 </beans>