From 2b195618c6aaba95e6e7352b34c78bed9b44aa44 Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Wed, 13 May 2015 19:54:23 +0530
Subject: [PATCH 1/2] Making components in carbon-devicemgt repository use
 Carbon kernel 4.4.0 based dependencies

---
 pom.xml | 52 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 66efc3f230..b60609f367 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1078,29 +1078,40 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
+        <repository>
+            <id>wso2-staging</id>
+            <name>WSO2 Staging Repository</name>
+            <url>http://maven.wso2.org/nexus/content/repositories/orgwso2carbonapimgt-004/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
     </repositories>
 
     <properties>
         <testng.version>6.1.1</testng.version>
-        <carbon.kernel.version>4.3.0</carbon.kernel.version>
+        <carbon.kernel.version>4.4.0</carbon.kernel.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
         <!-- Axis2 -->
         <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
         <axis2.orbit.version>1.6.1.wso2v11</axis2.orbit.version>
+        <axis2-transports.version>1.1.0-wso2v10</axis2-transports.version>
 
         <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
 
-        <!--Jaggery -->
-        <jaggery.version>0.9.0</jaggery.version>
-        <jaggery.extensions.version>1.0.0</jaggery.extensions.version>
-        <jaggery.extensions.sso.version>1.2.0</jaggery.extensions.sso.version>
-        <jaggery.extensions.carbon.version>1.1.0</jaggery.extensions.carbon.version>
-        <jaggery.extensions.test.version>1.1.0</jaggery.extensions.test.version>
+        <!-- Jaggery -->
+        <jaggery.version>0.10.0</jaggery.version>
+        <jaggery.extensions.version>1.3.0</jaggery.extensions.version>
+        <jaggery.extensions.sso.version>1.3.0</jaggery.extensions.sso.version>
+        <jaggery.extensions.carbon.version>1.3.0</jaggery.extensions.carbon.version>
+        <jaggery.extensions.test.version>1.3.0</jaggery.extensions.test.version>
 
-        <!--Testing -->
+        <!-- Testing -->
         <automation.test.framework.version>4.3.1</automation.test.framework.version>
         <automation.utils.version>4.3.0</automation.utils.version>
         <testng.version>6.8</testng.version>
@@ -1118,32 +1129,31 @@
         <tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>
 
         <!-- Carbon Deployment -->
-        <carbon.deployment.version>4.3.1</carbon.deployment.version>
+        <carbon.deployment.version>4.4.0</carbon.deployment.version>
 
-        <!-- Identity -->
-        <carbon.identity.version>4.3.3</carbon.identity.version>
+        <!-- Carbon Identity -->
+        <carbon.identity.version>4.4.0</carbon.identity.version>
 
+        <!-- Carbon Multi-tenancy -->
+        <carbon.multitenancy.version>4.4.0</carbon.multitenancy.version>
 
-        <!-- Multi-tenancy -->
-        <carbon.multitenancy.version>4.3.3</carbon.multitenancy.version>
+        <!-- Carbon Registry -->
+        <carbon.registry.version>4.4.1</carbon.registry.version>
 
-        <!-- Registry -->
-        <carbon.registry.version>4.3.0</carbon.registry.version>
+        <!-- Carbon Governance -->
+        <carbon.governance.version>4.4.1</carbon.governance.version>
 
-        <!-- Governance -->
-        <carbon.governance.version>4.3.0</carbon.governance.version>
-        <!-- axis2 versions -->
-        <axis2-transports.version>1.1.0-wso2v10</axis2-transports.version>
+        <!-- Axiom -->
         <axiom.version>1.2.11-wso2v5</axiom.version>
         <axiom.osgi.version.range>[1.2.11.wso2v5, 1.3.0)</axiom.osgi.version.range>
         <axiom.wso2.version>1.2.11.wso2v5</axiom.wso2.version>
 
-        <!-- Device Management -->
+        <!-- Carbon Device Management -->
         <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
         <carbon.commons.version>4.3.6</carbon.commons.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>1.3.1</carbon.api.mgt.version>
+        <carbon.api.mgt.version>1.4.0</carbon.api.mgt.version>
 
         <!--CXF properties-->
         <cxf.version>2.6.1</cxf.version>

From d76501cf15a2f0e16f4fea5577bc79e984c903b5 Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Wed, 13 May 2015 20:14:26 +0530
Subject: [PATCH 2/2] Fixing startup issues caused by not properly updating the
 Carbon-commons version in the parent pom of carbon-devicemgt repository

---
 .../src/main/resources/conf/cdm-config.xml    | 35 -------------
 .../main/resources/conf/license-config.xml    | 50 -------------------
 .../resources/conf/notification-messages.xml  | 32 ------------
 .../conf/user-api-publisher-config.xml        | 30 -----------
 .../src/main/resources/p2.inf                 |  7 +--
 pom.xml                                       |  6 ++-
 6 files changed, 5 insertions(+), 155 deletions(-)
 delete mode 100644 features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml
 delete mode 100644 features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml
 delete mode 100644 features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml
 delete mode 100644 features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml

diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml
deleted file mode 100644
index 0991207a54..0000000000
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, 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.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.
-  -->
-
-<DeviceMgtConfiguration>
-    <ManagementRepository>
-        <DataSourceConfiguration>
-            <JndiLookupDefinition>
-                <Name>jdbc/DM_DS</Name>
-            </JndiLookupDefinition>
-        </DataSourceConfiguration>
-        <EmailClientConfiguration>
-            <minimumThread>8</minimumThread>
-            <maximumThread>100</maximumThread>
-            <keepAliveTime>20</keepAliveTime>
-            <ThreadQueueCapacity>1000</ThreadQueueCapacity>
-        </EmailClientConfiguration>
-    </ManagementRepository>
-</DeviceMgtConfiguration>
-
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml
deleted file mode 100644
index e182e58bb9..0000000000
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, 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.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.
-  -->
-
-<LicenseConfig>
-    <Licenses>
-        <License>
-            <Provider>wso2</Provider>
-            <Name>android</Name>
-            <Version>1.0.0</Version>
-            <Language>1.0.0</Language>
-            <ValidFrom>01-01-2014</ValidFrom>
-            <ValidTo>31-12-2035</ValidTo>
-            <Text><![CDATA[Test License]]></Text>
-        </License>
-        <License>
-            <Provider>wso2</Provider>
-            <Name>ios</Name>
-            <Version>1.0.0</Version>
-            <Language>1.0.0</Language>
-            <ValidFrom>01-01-2014</ValidFrom>
-            <ValidTo>31-12-2035</ValidTo>
-            <Text><![CDATA[IOS License]]></Text>
-        </License>
-        <License>
-            <Provider>wso2</Provider>
-            <Name>windows</Name>
-            <Version>1.0.0</Version>
-            <Language>1.0.0</Language>
-            <ValidFrom>01-01-2014</ValidFrom>
-            <ValidTo>31-12-2035</ValidTo>
-            <Text><![CDATA[Windows License]]></Text>
-        </License>
-    </Licenses>
-</LicenseConfig>
\ No newline at end of file
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml
deleted file mode 100644
index 563b4a58c0..0000000000
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, 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.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.
--->
-
-<Notifications>
-    <EnrolmentNotifications>
-            <Header>Dear {title} {user-name},</Header>
-            <Body>You have been registered to the WSO2 MDM. Below is the link to enroll.</Body>
-            <Url>{downloadUrl}</Url>
-            <Footer>
-Best Regards,
-WSO2 Carbon Team
-http://www.wso2.com
-            </Footer>
-            <Subject>Enrol your device with WSO2 MDM</Subject>
-    </EnrolmentNotifications>
-</Notifications>
\ No newline at end of file
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml
deleted file mode 100644
index 3221092ae9..0000000000
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, 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.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.
--->
-<APIPublisherConfig>
-        <APIs>
-            <API>
-               <Name>appmanager</Name>
-               <Owner>admin</Owner>
-               <Context>enrollment</Context>
-               <Version>1.0.0</Version>
-               <Endpoint>http://localhost:9763/</Endpoint>
-               <Transports>http,https</Transports>
-            </API>
-        </APIs>
-</APIPublisherConfig>
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf
index 36ac4e31ef..a7f67523c6 100644
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf
+++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf
@@ -1,7 +1,2 @@
 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}/conf/notification-messages.xml,target:${installFolder}/../../conf/notification-messages.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/license-config.xml,target:${installFolder}/../../conf/etc/license-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/user-api-publisher-config.xml,target:${installFolder}/../../conf/etc/user-api-publisher-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);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/webapp-authenticator-config.xml,target:${installFolder}/../../conf/etc/webapp-authenticator-config.xml,overwrite:true);\
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b60609f367..a325bcaede 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1150,9 +1150,11 @@
 
         <!-- Carbon Device Management -->
         <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.commons.version>4.3.6</carbon.commons.version>
 
-        <!-- API Management -->
+	<!-- Carbon Commons -->
+        <carbon.commons.version>4.4.0</carbon.commons.version>
+
+        <!-- Carbon API Management -->
         <carbon.api.mgt.version>1.4.0</carbon.api.mgt.version>
 
         <!--CXF properties-->