From 9bddb9407b1f8c9c061fbc9d91d36c779b30687b Mon Sep 17 00:00:00 2001
From: Geeth Munasinghe <geeth@wso2.com>
Date: Tue, 23 Dec 2014 15:03:40 +0530
Subject: [PATCH 1/4] Fixing pom issues

---
 .../org.wso2.carbon.device.mgt.core/pom.xml   |  9 +++
 components/device-mgt/pom.xml                 |  9 +--
 components/key-mgt/pom.xml                    |  6 +-
 components/policy-mgt/pom.xml                 |  4 +-
 pom.xml                                       | 71 +++++++++++++++++--
 product/modules/p2-profile-gen/pom.xml        | 20 +++---
 6 files changed, 94 insertions(+), 25 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index e839f5407..f1ceacf06 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -141,6 +141,15 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.tomcat.ext</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.tomcat</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml
index 7b248638d..518822168 100644
--- a/components/device-mgt/pom.xml
+++ b/components/device-mgt/pom.xml
@@ -42,7 +42,7 @@
         <module>org.wso2.carbon.device.mgt.mobile.impl</module>
     </modules>
 
-    <dependencyManagement>
+<!--    <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.eclipse.osgi</groupId>
@@ -95,7 +95,7 @@
                 <version>4.3.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
-    </dependencyManagement>
+    </dependencyManagement>-->
 
     <build>
         <pluginManagement>
@@ -116,9 +116,4 @@
             </plugins>
         </pluginManagement>
     </build>
-    <properties>
-        <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
-        <apim.version>1.2.1</apim.version>
-        <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
-    </properties>
 </project>
diff --git a/components/key-mgt/pom.xml b/components/key-mgt/pom.xml
index e427627af..67b910014 100644
--- a/components/key-mgt/pom.xml
+++ b/components/key-mgt/pom.xml
@@ -40,6 +40,7 @@
         <module>org.wso2.carbon.key.mgt.handler.valve</module>
     </modules>
 
+<!--
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -89,6 +90,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+-->
 
     <build>
         <pluginManagement>
@@ -109,9 +111,9 @@
             </plugins>
         </pluginManagement>
     </build>
-    <properties>
+<!--    <properties>
         <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
         <apim.version>1.2.1</apim.version>
         <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
-    </properties>
+    </properties>-->
 </project>
diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml
index 53a5d3d0c..44645e77f 100644
--- a/components/policy-mgt/pom.xml
+++ b/components/policy-mgt/pom.xml
@@ -42,7 +42,7 @@
         <module>org.wso2.carbon.policy.evalutor</module>
     </modules>
 
-    <dependencyManagement>
+<!--    <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.eclipse.osgi</groupId>
@@ -60,7 +60,7 @@
                 <version>4.3.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
-    </dependencyManagement>
+    </dependencyManagement>-->
 
     <build>
         <pluginManagement>
diff --git a/pom.xml b/pom.xml
index 8f324b9b5..d39097a1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,22 +157,22 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.platform.version}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.core</artifactId>
-                <version>${carbon.platform.version}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.platform.version}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.rdbms</artifactId>
-                <version>${carbon.platform.version}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -184,6 +184,64 @@
                 <artifactId>jboss-transaction-api_1.1_spec</artifactId>
                 <version>${jboss-transaction-api.version}</version>
             </dependency>
+
+
+            <dependency>
+                <groupId>org.eclipse.osgi</groupId>
+                <artifactId>org.eclipse.osgi</artifactId>
+                <version>3.8.1.v20120830-144521</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>org.eclipse.equinox.common</artifactId>
+                <version>3.6.100.v20120522-1841</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.logging</artifactId>
+                <version>${carbon.kernel.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+                <version>${cdm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.osgi</groupId>
+                <artifactId>org.eclipse.osgi.services</artifactId>
+                <version>3.3.100.v20120522-1822</version>
+            </dependency>
+            <dependency>
+                <groupId>com.h2database.wso2</groupId>
+                <artifactId>h2-database-engine</artifactId>
+                <version>${orbit.version.h2.engine}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.apimgt.core</artifactId>
+                <version>${apim.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
+                <version>${apim.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.wso2</groupId>
+                <artifactId>tomcat</artifactId>
+                <version>${orbit.version.tomcat}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.tomcat.ext</artifactId>
+                <version>${carbon.kernel.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.tomcat</artifactId>
+                <version>${carbon.kernel.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -196,6 +254,7 @@
         <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
         <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
+        <cdm.version>2.0.0-SNAPSHOT</cdm.version>
         <!--Testing -->
         <test.framework.version>4.3.1</test.framework.version>
         <testng.version>6.8</testng.version>
@@ -205,6 +264,10 @@
         <!--Eclipse Osgi-->
         <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
         <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
+
+        <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
+        <apim.version>1.2.1</apim.version>
+        <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
     </properties>
 
 
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index acafff81f..774d6c4c2 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -100,9 +100,9 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
 
                             <featureArtifacts>
-                                <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.kernel.version}
-                                </featureArtifactDef>
+                                <!--<featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
+                                </featureArtifactDef>-->
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version}
                                 </featureArtifactDef>
@@ -139,7 +139,7 @@
 
                                 <!-- API Manager related features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.kernel.version}
+                                    org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.platform.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.um.ws.service.server.feature:${carbon.platform.version}
@@ -218,16 +218,16 @@
                             <features>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.core.feature.group</id>
-                                    <version>${carbon.kernel.version}</version>
+                                    <version>${carbon.platform.version}</version>
                                 </feature>
-                                <feature>
+                               <!-- <feature>
                                     <id>org.wso2.carbon.ndatasource.feature.group</id>
                                     <version>${carbon.kernel.version}</version>
-                                </feature>
-                                <feature>
+                                </feature>-->
+                                <!--<feature>
                                     <id>org.wso2.carbon.ndatasource.ui.feature.group</id>
-                                    <version>${carbon.kernel.version}</version>
-                                </feature>
+                                    <version>${carbon.platform.version}</version>
+                                </feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.server.feature.group</id>
                                     <version>${project.version}</version>

From 704afe78ae24fcd8a962e17046b5ee6e55997fbe Mon Sep 17 00:00:00 2001
From: manoj <manojg@wwso2.com>
Date: Mon, 5 Jan 2015 15:31:47 +0530
Subject: [PATCH 2/4] Delete test classes

---
 .../device/mgt/core/dao/DeviceDAOTest.java    | 28 --------------
 .../java/cdm/api/android/Authentication.java  | 37 -------------------
 2 files changed, 65 deletions(-)
 delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAOTest.java
 delete mode 100644 product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAOTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAOTest.java
deleted file mode 100644
index 980527aae..000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAOTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.device.mgt.core.dao;
-
-import org.testng.Assert;
-
-public class DeviceDAOTest {
-
-  //  @Test
-    public void setUp() throws Exception {
-   //     log.info("Testing started.");
-        Assert.assertEquals("A", "A");
-    }
-
-}
diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java
deleted file mode 100644
index b5687928b..000000000
--- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011-2012 WSO2, Inc. (http://wso2.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cdm.api.android;
-
-import javax.ws.rs.*;
-
-@Path("/authenticate/")
-public class Authentication {
-
-    @POST
-    @Path("/device/")
-    public String authenticateDevice(@FormParam("username") String username,
-            @FormParam("password") String password) {
-        return "jwwfowrjwqporqwrpqworpq";
-    }
-
-    @POST
-    @Path("/device/license")
-    @Produces ("text/plain")
-    public String getLicense() {
-        return "License Agreement";
-    }
-}

From f01f822f6f43c5ae5b1b3f78d346faedce8053a5 Mon Sep 17 00:00:00 2001
From: manoj <manojg@wwso2.com>
Date: Mon, 5 Jan 2015 15:32:02 +0530
Subject: [PATCH 3/4] Refactor Device Management service exception class

---
 .../device/mgt/common/DeviceManagementServiceException.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementServiceException.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementServiceException.java
index 941d04db5..d350a1391 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementServiceException.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementServiceException.java
@@ -18,9 +18,6 @@
 
 package org.wso2.carbon.device.mgt.common;
 
-/**
- * Created by manoj on 12/22/14.
- */
 public class DeviceManagementServiceException extends Exception {
 
     private static final long serialVersionUID = -8933146283800122640L;

From e29d863a2e342a754014cb14f3ff80c0c729f4cc Mon Sep 17 00:00:00 2001
From: Geeth Munasinghe <geeth@wso2.com>
Date: Tue, 6 Jan 2015 14:04:31 +0530
Subject: [PATCH 4/4] Fixing build problems

---
 .../pom.xml                                      | 12 ++++++------
 .../pom.xml                                      |  2 +-
 .../pom.xml                                      |  2 +-
 pom.xml                                          |  2 +-
 product/modules/p2-profile-gen/pom.xml           | 16 ++++++++++++----
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
index cbf563398..2da85a8db 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
-	    <version>${project.version}</version>
+            <version>${project.version}</version>
         </dependency>
-	<dependency>
+        <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
             <version>${project.version}</version>
-	</dependency>
+        </dependency>
     </dependencies>
 
     <build>
@@ -98,13 +98,13 @@
                             <bundles>
                                 <bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.impl:${project.version}
                                 </bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version}
+                                <bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version}
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
-				<importFeatureDef>org.wso2.carbon.device.mgt.server:${project.version}
+                                <importFeatureDef>org.wso2.carbon.device.mgt.server:${project.version}
                                 </importFeatureDef>
                             </importFeatures>
                         </configuration>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
index ab9bf942f..ba36238a2 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
@@ -112,7 +112,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                             </importFeatures>
                         </configuration>
diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
index 1d272a151..4cca87102 100644
--- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
+++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
@@ -112,7 +112,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                             </importFeatures>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index d39097a1c..44542484c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,7 +247,7 @@
 
     <properties>
         <testng.version>6.1.1</testng.version>
-        <carbon.kernel.version>4.3.0-SNAPSHOT</carbon.kernel.version>
+        <carbon.kernel.version>4.3.0</carbon.kernel.version>
         <carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index 774d6c4c2..f1524dbb3 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -133,9 +133,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
+                                <!--<featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.dbconsole.ui.feature:${carbon.platform.version}
-                                </featureArtifactDef>
+                                </featureArtifactDef>-->
 
                                 <!-- API Manager related features -->
                                 <featureArtifactDef>
@@ -180,6 +180,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.platform.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.version}
                                 </featureArtifactDef>
@@ -318,6 +321,11 @@
                                     <id>org.wso2.carbon.event.server.feature.group</id>
                                     <version>${carbon.platform.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.event.common.feature.group</id>
+                                    <version>${carbon.platform.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
                                     <version>${carbon.platform.version}</version>
@@ -340,10 +348,10 @@
                                     <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
                                     <version>${carbon.platform.version}</version>
                                 </feature>
-                                <feature>
+                                <!--<feature>
                                     <id>org.wso2.carbon.dbconsole.ui.feature.group</id>
                                     <version>${carbon.platform.version}</version>
-                                </feature>
+                                </feature>-->
                             </features>
                         </configuration>
                     </execution>