diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManager.java
new file mode 100644
index 0000000000..0275a1bc20
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManager.java
@@ -0,0 +1,30 @@
+/*
+ *
+ *  * 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.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 org.wso2.carbon.device.mgt.core;
+
+import org.wso2.carbon.device.mgt.core.dto.DeviceType;
+
+public class LicenseManager {
+
+/*    public void addLicense(DeviceType deviceType,String langCode, String
+            );*/
+
+}
diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java
index e0e418b8a2..c771704100 100644
--- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java
+++ b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java
@@ -1,20 +1,19 @@
 /*
  * 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
+ *  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
+ *          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.
-*/
+ *  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.util;
 
 import org.apache.commons.logging.Log;
@@ -32,7 +31,6 @@ public class AndroidAPIUtils {
     private static Log log = LogFactory.getLog(AndroidAPIUtils.class);
 
 	public static DeviceIdentifier convertToDeviceIdentifierObject(String deviceId) {
-
 		DeviceIdentifier identifier = new DeviceIdentifier();
 		identifier.setId(deviceId);
 		identifier.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
@@ -42,7 +40,8 @@ public class AndroidAPIUtils {
 
 	public static DeviceManagementService getDeviceManagementService() throws DeviceManagementServiceException{
 
-        // until complete login this is use to load super tenant context
+        //TODO: complete login change super tenent context
+
 		DeviceManagementService dmService;
 		PrivilegedCarbonContext.startTenantFlow();
 		PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidConstants.java b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidConstants.java
index f3880536c2..0dcb9e59de 100644
--- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidConstants.java
+++ b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidConstants.java
@@ -1,20 +1,19 @@
 /*
  * 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.
+ * 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
+ *        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.
-*/
+ * 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.util;
 
 /**
diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/Message.java b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/Message.java
index 5361ff0d4c..f5e34cf7ec 100644
--- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/Message.java
+++ b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/Message.java
@@ -1,20 +1,21 @@
 /*
  * 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
+ *   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
+ *   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.
-*/
+ *   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.util;
 
 import javax.xml.bind.annotation.XmlElement;
diff --git a/product/modules/distribution/src/repository/conf/registry.xml b/product/modules/distribution/src/repository/conf/registry.xml
new file mode 100644
index 0000000000..70ab4ea5a1
--- /dev/null
+++ b/product/modules/distribution/src/repository/conf/registry.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ /*
+  ~  * 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.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.
+  ~ */
+  -->
+
+<wso2registry>
+
+    <!-- These are used to define the DB configuration and the basic parameters to be used for the registry -->
+
+    <currentDBConfig>wso2registry</currentDBConfig>
+    <readOnly>false</readOnly>
+    <enableCache>true</enableCache>
+    <registryRoot>/</registryRoot>
+
+    <!-- This defines the default database and its configuration of the registry -->
+
+    <dbConfig name="wso2registry">
+        <dataSource>jdbc/WSO2CarbonDB</dataSource>
+    </dbConfig>
+
+    <!-- This handler provides the feature to add a simlink to a given resource -->
+    <!--
+     <handler class="org.wso2.carbon.registry.extensions.handlers.ExtensionsSymLinkHandler">
+        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.URLMatcher">
+            <property name="pattern">.*</property>
+        </filter>
+    </handler>
+    -->
+
+    <!-- This handler provides resource retention locking for the resources -->
+
+    <handler class="org.wso2.carbon.registry.extensions.handlers.RetentionHandler"
+            methods="PUT,DELETE,MOVE,RENAME,IMPORT,COPY,ADD_ASSOCIATION,REMOVE_ASSOCIATION,RESTORE,RESTORE_VERSION">
+        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.URLMatcher">
+            <property name="pattern">.*</property>
+        </filter>
+    </handler>
+
+
+    <!-- This handler processes the services being added to the registry -->
+<!--
+    <handler class="org.wso2.carbon.registry.extensions.handlers.ServiceMediaTypeHandler">
+
+        <property name="defaultServiceVersion">1.0.0-SNAPSHOT</property>
+        <property name="disableSymlinkCreation">true</property>
+        <property name="smartLifecycleLinks" type="xml">
+            <key>dev</key>
+            <key>qa</key>
+            <key>live</key>
+        </property>        
+        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+            <property name="mediaType">application/vnd.wso2-service+xml</property>
+        </filter>
+    </handler>
+-->
+    <!-- This handler provides the ability to remove the entire heirarchy for a given service while deleting the service -->
+
+    <handler class="org.wso2.carbon.registry.extensions.handlers.DeleteHierarchyHandler">
+        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+            <property name="mediaType">application/vnd.wso2-service+xml</property>
+        </filter>
+    </handler>    
+
+
+   <!--This handler delete the subscription hierarcy generated in the notifications path when a subscription is deleted directly -->
+
+    <handler class="org.wso2.carbon.registry.extensions.handlers.DeleteHierarchyHandler">
+         <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.URLMatcher">
+                <property name="deletePattern">/_system/governance/event/topics/registry/notifications/.*</property>
+         </filter>
+    </handler>
+
+
+    <!-- This handler processes the links for the lifecycle -->
+<!--
+    <handler class="org.wso2.carbon.registry.extensions.handlers.SmartLifecycleLinkHandler">
+        <property name="states" type="xml">
+            <state key="dev">Created</state>
+            <state key="qa">Tested</state>
+            <state key="live">Deployed</state>
+        </property>
+        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+            <property name="mediaType">application/vnd.wso2-smart-link</property>
+        </filter>
+    </handler>
+-->
+    <!-- This handler processes the policy files of the given media type defined by the filter -->
+
+    <handler class="org.wso2.carbon.registry.extensions.handlers.PolicyMediaTypeHandler">
+	<property name="policyLocationConfiguration" type="xml">
+            <location>/trunk/policies/</location>            
+	</property>
+        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+            <property name="mediaType">application/policy+xml</property>
+        </filter>
+    </handler>
+
+    <!-- This handler processes the schema types which are defined by the filter  -->
+
+    <handler class="org.wso2.carbon.registry.extensions.handlers.XSDMediaTypeHandler">
+        <!--property name="disableSchemaValidation">true</property-->
+        <property name="disableSymlinkCreation">true</property>
+        <property name="locationConfiguration" type="xml">
+            <location>/trunk/schemas/</location>            
+        </property>
+        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+            <property name="mediaType">application/x-xsd+xml</property>
+        </filter>
+    </handler>
+
+    <!-- This handler processes making an external link to a given resource -->
+
+    <!--
+    <handler class="org.wso2.carbon.registry.extensions.handlers.ExternalLinkHandler">
+        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+            <property name="mediaType">application/vnd.wso2-hyperlink</property>
+        </filter>
+    </handler>
+    -->
+    <!-- This handler processes service end-points defined in the WSDL files being uploaded to the registry -->
+<!--
+    <handler class="org.wso2.carbon.registry.extensions.handlers.EndpointMediaTypeHandler">
+        <property name="endpointMediaType">application/vnd.wso2.endpoint</property>
+        <property name="endpointLocationConfiguration" type="xml">
+            <location>/trunk/endpoints/</location>
+        </property>
+        <filter class="org.wso2.carbon.registry.extensions.filters.EndpointMediaTypeMatcher">
+        </filter>
+    </handler>
+
+    <handler class="org.wso2.carbon.governance.registry.extensions.handlers.UriMediaTypeHandler">
+	<filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+	    <property name="mediaType">application/vnd.wso2-uri+xml</property>
+	</filter>
+    </handler>
+-->
+    <!-- When a resource/governance artifact is deleted, this handler will cleanup all its bounded subscriptions from registry-->
+
+    <handler class="org.wso2.carbon.registry.extensions.handlers.DeleteSubscriptionHandler">
+         <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.URLMatcher">
+                 <property name="pattern">.*</property>
+         </filter>
+    </handler>
+
+    <!--This handler manage the meta data resource caching-->
+    <handler class="org.wso2.carbon.governance.registry.extensions.handlers.MetaDataCacheHandler">
+        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.URLMatcher">
+            <property name="pattern">.*</property>
+        </filter>
+    </handler>
+
+    <!--This handler clears the caches when workflow-extension config is updated.-->
+   <handler class="org.wso2.carbon.apimgt.impl.handlers.APIConfigMediaTypeHandler" methods="PUT,DELETE">
+      <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
+        <property name="mediaType">workflow-config</property>
+    </filter>
+   </handler>
+
+    <!--remoteInstance url="https://localhost:9443/registry">
+	<id>instanceid</id>
+	    <username>username</username>
+	    <password>password</password>
+        <cacheId>wso2carbon@jdbc:h2:repository/database/WSO2CARBON_DB</cacheId>
+    </remoteInstance-->
+
+    <!-- This defines the Atom based remote registry instance configuration -->
+
+    <!--remoteInstance url="https://localhost:9443/registry">
+        <id>instanceid</id>
+        <username>username</username>
+        <password>password</password>
+        <type>ws</type>
+        <cacheId>wso2carbon@jdbc:h2:repository/database/WSO2CARBON_DB</cacheId>
+    </remoteInstance-->
+
+    <!-- This defines the JDBC based remote registry instance configuration  -->
+
+    <!--remoteInstance url="https://localhost:9443/registry">
+        <id>instanceid</id>
+        <dbConfig>wso2registry</dbConfig>
+        <readOnly>false</readOnly>
+        <enableCache>true</enableCache>
+        <registryRoot>/</registryRoot>
+    </remoteInstance-->
+
+    <!-- This defines the mount configuration to be used with the remote instance and the target path for the mount -->
+
+    <!--mount path="/_system/config" overwrite="true|false|virtual">
+        <instanceId>instanceid</instanceId>
+        <targetPath>/_system/nodes</targetPath>
+    </mount-->
+
+    <!-- This defines index configuration which is used in meta data search feature of the registry -->
+    <indexingConfiguration>
+        <startingDelayInSeconds>60</startingDelayInSeconds>
+        <indexingFrequencyInSeconds>2</indexingFrequencyInSeconds>
+        <!--number of resources submit for given indexing thread -->
+        <batchSize>50</batchSize>
+        <!--number of worker threads for indexing -->
+        <indexerPoolSize>10</indexerPoolSize>
+        <!-- location storing the time the indexing took place-->
+        <lastAccessTimeLocation>/_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime</lastAccessTimeLocation>
+        <!-- the indexers that implement the indexer interface for a relevant media type/(s) -->
+        <indexers>
+            <!--indexer class="org.wso2.carbon.registry.indexing.indexer.MSExcelIndexer" mediaTypeRegEx="application/vnd.ms-excel"/>
+            <indexer class="org.wso2.carbon.registry.indexing.indexer.MSPowerpointIndexer" mediaTypeRegEx="application/vnd.ms-powerpoint"/>
+            <indexer class="org.wso2.carbon.registry.indexing.indexer.MSWordIndexer" mediaTypeRegEx="application/msword"/>
+            <indexer class="org.wso2.carbon.registry.indexing.indexer.PDFIndexer" mediaTypeRegEx="application/pdf"/>
+            <indexer class="org.wso2.carbon.registry.indexing.indexer.XMLIndexer" mediaTypeRegEx="application/xml"/-->
+            <!--indexer class="org.wso2.carbon.governance.registry.extensions.indexers.RXTIndexer" mediaTypeRegEx="application/wsdl\+xml" profiles ="default,api-store,api-publisher"/>
+            <indexer class="org.wso2.carbon.governance.registry.extensions.indexers.RXTIndexer" mediaTypeRegEx="application/x-xsd\+xml " profiles ="default,api-store,api-publisher"/>
+            <indexer class="org.wso2.carbon.governance.registry.extensions.indexers.RXTIndexer" mediaTypeRegEx="application/policy\+xml" profiles ="default,api-store,api-publisher"/-->
+            <indexer class="org.wso2.carbon.governance.registry.extensions.indexers.RXTIndexer" mediaTypeRegEx="application/vnd.(.)+\+xml" profiles ="default,api-store,api-publisher"/>
+            <!--indexer class="org.wso2.carbon.registry.indexing.indexer.XMLIndexer" mediaTypeRegEx="application/(.)+\+xml"/>
+            <indexer class="org.wso2.carbon.registry.indexing.indexer.PlainTextIndexer" mediaTypeRegEx="text/(.)+"/>
+            <indexer class="org.wso2.carbon.registry.indexing.indexer.PlainTextIndexer" mediaTypeRegEx="application/x-javascript"/-->
+	    <indexer class="org.wso2.carbon.apimgt.impl.indexing.indexer.PlainTextIndexer" mediaTypeRegEx="text/plain+" profiles ="default,api-store,api-publisher"/>
+	    <indexer class="org.wso2.carbon.apimgt.impl.indexing.indexer.PDFIndexer" mediaTypeRegEx="application/pdf" profiles ="default,api-store,api-publisher"/>
+	    <indexer class="org.wso2.carbon.apimgt.impl.indexing.indexer.MSWordIndexer" mediaTypeRegEx="application/msword" profiles ="default,api-store,api-publisher"/>
+	    <indexer class="org.wso2.carbon.apimgt.impl.indexing.indexer.MSPowerpointIndexer" mediaTypeRegEx="application/vnd.ms-powerpoint" profiles ="default,api-store,api-publisher"/>
+	    <indexer class="org.wso2.carbon.apimgt.impl.indexing.indexer.MSExcelIndexer" mediaTypeRegEx="application/vnd.ms-excel" profiles ="default,api-store,api-publisher"/>
+	    <indexer class="org.wso2.carbon.apimgt.impl.indexing.indexer.XMLIndexer" mediaTypeRegEx="application/xml" profiles ="default,api-store,api-publisher"/>
+    	    <indexer class="org.wso2.carbon.apimgt.impl.indexing.indexer.WSDLIndexer" mediaTypeRegEx="application/api-wsdl" profiles ="default,api-store,api-publisher"/>
+        </indexers>
+        <exclusions>
+            <exclusion pathRegEx="/_system/config/repository/dashboards/gadgets/swfobject1-5/.*[.]html"/>
+            <exclusion pathRegEx="/_system/local/repository/components/org[.]wso2[.]carbon[.]registry/mount/.*"/>
+        </exclusions>
+    </indexingConfiguration>
+
+
+    <!-- This static configuration is suppose to be modified before any data being loaded to the registry (i.e.: before the first startup) -->
+    
+    <staticConfiguration>
+        <versioningProperties>true</versioningProperties>
+        <versioningComments>true</versioningComments>
+        <versioningTags>true</versioningTags>
+        <versioningRatings>true</versioningRatings>
+        <!-- Location you want to add service and default location will be /services/ -->
+        <servicePath>/trunk/services/</servicePath>
+    </staticConfiguration>
+
+    <!-- This enables auto-versioning of resources (non-collection). Whenever a resource is updated a new version will be created -->
+  
+    <versionResourcesOnChange>false</versionResourcesOnChange>
+    
+    <!-- This enables JMX management for G-Reg -->
+    
+    <jmx enabled="false">
+        <service name="InvocationStatistics" enabled="true"/>
+        <service name="Activities" enabled="true"/>
+        <service name="Properties" enabled="true"/>
+        <service name="Subscriptions" enabled="true"/>
+        <service name="Events" enabled="true"/>
+    </jmx>
+    
+    <!-- If you need to use a Remote Human Task to provide the Work List functionality instead of the Embedded Human Task or if you want
+         to use Work List notifications, uncomment the following configuration. Please note that you need to provide the credentials 
+         and URL to connect to the remote instance (ex:- remote BPS server) if you are planning to use a Remote Human Task. You should
+         provide credentials and URL to connect to the local instance if you simply want to use Work List notifications. -->
+    
+    <!--workList serverURL="local://services/" remote="false">
+        <username>admin</username>
+        <password>admin</password>
+    </workList-->
+    
+    <!-- Sample SCM configuration. Please note that checkOutURL, workingDir, and mountPoint are mandatory for each connection. 
+         The update frequency is in minutes. Setting readOnly would disable checkIn even if the checkInURL is set. The credentials
+         are to connect to the corresponding repository and must be provided if required. -->
+    
+    <!--scm>
+        <connection checkOutURL="scm:svn:http://svn.wso2.org/repos/wso2" workingDir="/valid/filesystem/path" mountPoint="/_system/foo" checkInURL="" readOnly="" updateFrequency="">
+        	<username>admin</username>
+        	<password>admin</password>
+        </connection>
+    </scm-->
+    
+    <!-- This defines the list of scheduled tasks for the registry -->
+    
+    <!--tasks>
+        <task name="TaskName" class="com.foo.TaskClass">
+            <trigger cron="cronExpr"/>
+            <property key="foo" value="FooVal" />
+            <property key="bar" value="BarVal" />
+        </task>
+    </tasks-->
+
+</wso2registry>