Fixing git repo issues

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java

@@ -23,29 +23,17 @@ import java.util.List;
 public class Device {
 
     private int id;
-
     private String type;
-
     private String description;
-
     private String name;
-
     private Long dateOfEnrolment;
-
     private Long dateOfLastUpdate;
-
     private String ownership;
-
     private boolean status;
-
     private int deviceTypeId;
-
     private String deviceIdentifier;
-
     private String owner;
-
     private List<Feature> features;
-
     private List<Device.Property> properties;
 
     @XmlElement
@@ -56,6 +44,7 @@ public class Device {
     public void setId(int id) {
         this.id = id;
     }
+
     @XmlElement
     public String getDescription() {
         return description;
@@ -64,6 +53,7 @@ public class Device {
     public void setDescription(String description) {
         this.description = description;
     }
+
     @XmlElement
     public String getName() {
         return name;
@@ -72,6 +62,7 @@ public class Device {
     public void setName(String name) {
         this.name = name;
     }
+
     @XmlElement
     public Long getDateOfEnrolment() {
         return dateOfEnrolment;
@@ -80,6 +71,7 @@ public class Device {
     public void setDateOfEnrolment(Long dateOfEnrolment) {
         this.dateOfEnrolment = dateOfEnrolment;
     }
+
     @XmlElement
     public Long getDateOfLastUpdate() {
         return dateOfLastUpdate;
@@ -88,6 +80,7 @@ public class Device {
     public void setDateOfLastUpdate(Long dateOfLastUpdate) {
         this.dateOfLastUpdate = dateOfLastUpdate;
     }
+
     @XmlElement
     public String getOwnership() {
         return ownership;
@@ -96,6 +89,7 @@ public class Device {
     public void setOwnership(String ownership) {
         this.ownership = ownership;
     }
+
     @XmlElement
     public boolean isStatus() {
         return status;
@@ -104,6 +98,7 @@ public class Device {
     public void setStatus(boolean status) {
         this.status = status;
     }
+
     @XmlElement
     public int getDeviceTypeId() {
         return deviceTypeId;
@@ -112,6 +107,7 @@ public class Device {
     public void setDeviceTypeId(int deviceTypeId) {
         this.deviceTypeId = deviceTypeId;
     }
+
     @XmlElement
     public String getDeviceIdentifier() {
         return deviceIdentifier;
@@ -120,6 +116,7 @@ public class Device {
     public void setDeviceIdentifier(String deviceIdentifier) {
         this.deviceIdentifier = deviceIdentifier;
     }
+
     @XmlElement
     public String getOwner() {
         return owner;
@@ -128,6 +125,7 @@ public class Device {
     public void setOwner(String owner) {
         this.owner = owner;
     }
+
     @XmlElement
     public List<Feature> getFeatures() {
         return features;
@@ -136,6 +134,7 @@ public class Device {
     public void setFeatures(List<Feature> features) {
         this.features = features;
     }
+
     @XmlElement
     public String getType() {
         return type;
@@ -144,6 +143,7 @@ public class Device {
     public void setType(String type) {
         this.type = type;
     }
+
     @XmlElement
     public List<Device.Property> getProperties() {
         return properties;

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/License.java

@@ -0,0 +1,53 @@
+/*
+ *
+ *  * 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.common;
+
+public class License {
+
+    private String licenseName;
+    private String licenseText;
+    private String licenseVersion;
+
+    public String getLicenseName() {
+        return licenseName;
+    }
+
+    public void setLicenseName(String licenseName) {
+        this.licenseName = licenseName;
+    }
+
+    public String getLicenseText() {
+        return licenseText;
+    }
+
+    public void setLicenseText(String licenseText) {
+        this.licenseText = licenseText;
+    }
+
+    public String getLicenseVersion() {
+        return licenseVersion;
+    }
+
+    public void setLicenseVersion(String licenseVersion) {
+        this.licenseVersion = licenseVersion;
+    }
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java

@@ -45,6 +45,7 @@ public class DeviceManagementRepository {
 
     public void removeDeviceManagementProvider(DeviceManagerService provider) {
         String deviceType = provider.getProviderType();
+
         try {
             DeviceManagerUtil.unregisterDeviceType(deviceType);
         } catch (DeviceManagementException e) {
@@ -56,5 +57,4 @@ public class DeviceManagementRepository {
     public DeviceManagerService getDeviceManagementProvider(String type) {
         return providers.get(type);
     }
-
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java

@@ -29,6 +29,7 @@ import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dao.DeviceTypeDAO;
 import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class DeviceManagerImpl implements DeviceManager {
@@ -51,10 +52,9 @@ public class DeviceManagerImpl implements DeviceManager {
         boolean status = dms.enrollDevice(device);
 
         try {
-            this.getDeviceTypeDAO().getDeviceType();
             org.wso2.carbon.device.mgt.core.dto.Device deviceDto = DeviceManagementDAOUtil.convertDevice(device);
             Integer deviceTypeId = this.getDeviceTypeDAO().getDeviceTypeIdByDeviceTypeName(device.getType());
-            deviceDto.setDeviceType(deviceTypeId);
+            deviceDto.setDeviceTypeId(deviceTypeId);
             this.getDeviceDAO().addDevice(deviceDto);
 
         } catch (DeviceManagementDAOException e) {
@@ -106,7 +106,27 @@ public class DeviceManagerImpl implements DeviceManager {
     public List<Device> getAllDevices(String type) throws DeviceManagementException {
       DeviceManagerService dms =
                 this.getPluginRepository().getDeviceManagementProvider(type);
-        return dms.getAllDevices();
+	    List<Device> devicesList = new ArrayList<Device>();
+        try {
+            Integer deviceTypeId = this.getDeviceTypeDAO().getDeviceTypeIdByDeviceTypeName(type);
+	        List<org.wso2.carbon.device.mgt.core.dto.Device> devices =
+			        this.getDeviceDAO().getDevices(deviceTypeId);
+
+            for (org.wso2.carbon.device.mgt.core.dto.Device device : devices) {
+                Device convertedDevice = DeviceManagementDAOUtil.convertDevice(device);
+                DeviceIdentifier deviceIdentifier = DeviceManagementDAOUtil
+                        .createDeviceIdentifier(device, this.deviceTypeDAO
+                                .getDeviceType(device.getDeviceTypeId()));
+                Device dmsDevice = dms.getDevice(deviceIdentifier);
+                convertedDevice.setProperties(dmsDevice.getProperties());
+                convertedDevice.setFeatures(dmsDevice.getFeatures());
+                devicesList.add(convertedDevice);
+            }
+        } catch (DeviceManagementDAOException e) {
+            throw new DeviceManagementException("Error occurred while obtaining the device for type '" + type + "'",
+                                                e);
+        }
+	    return devicesList;
     }
 
     @Override

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java

@@ -39,4 +39,11 @@ public interface DeviceDAO {
     Device getDeviceByDeviceId(Long deviceId) throws DeviceManagementDAOException;
 
     List<Device> getDevices() throws DeviceManagementDAOException;
+
+    /**
+     * @param type - The device type id.
+     * @return  a list of devices based on the type id.
+     * @throws DeviceManagementDAOException
+     */
+    List<Device> getDevices(Integer type) throws DeviceManagementDAOException;
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceTypeDAO.java

@@ -17,7 +17,6 @@
  */
 package org.wso2.carbon.device.mgt.core.dao;
 
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 
 import java.util.List;
@@ -33,7 +32,7 @@ public interface DeviceTypeDAO {
 
     List<DeviceType> getDeviceTypes() throws DeviceManagementDAOException;
 
-    DeviceIdentifier getDeviceType() throws DeviceManagementDAOException;
+    DeviceType getDeviceType(Integer id) throws DeviceManagementDAOException;
 
     Integer getDeviceTypeIdByDeviceTypeName(String type) throws DeviceManagementDAOException;
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java

@@ -31,6 +31,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -62,7 +63,7 @@ public class DeviceDAOImpl implements DeviceDAO {
             stmt.setLong(4, new Date().getTime());
             stmt.setString(5, device.getOwnerShip());
             stmt.setString(6, device.getStatus().toString());
-            stmt.setInt(7, device.getDeviceType());
+            stmt.setInt(7, device.getDeviceTypeId());
             stmt.setString(8, device.getDeviceIdentificationId());
             stmt.setString(9, device.getOwnerId());
             stmt.setInt(10, device.getTenantId());
@@ -102,6 +103,47 @@ public class DeviceDAOImpl implements DeviceDAO {
         return null;
     }
 
+    @Override public List<Device> getDevices(Integer type) throws DeviceManagementDAOException {
+        Connection conn = null;
+        PreparedStatement stmt = null;
+        ResultSet resultSet = null;
+        List<Device> devicesList = null;
+        try {
+            conn = this.getConnection();
+            String selectDBQueryForType = "SELECT ID, DESCRIPTION, NAME, DATE_OF_ENROLLMENT, " +
+                                          "DATE_OF_LAST_UPDATE, OWNERSHIP, STATUS, DEVICE_TYPE_ID, " +
+                                          "DEVICE_IDENTIFICATION, OWNER, TENANT_ID FROM DM_DEVICE " +
+                                          "WHERE DM_DEVICE.DEVICE_TYPE_ID=?";
+            stmt = conn.prepareStatement(selectDBQueryForType);
+            stmt.setInt(1, type);
+            resultSet = stmt.executeQuery();
+            devicesList = new ArrayList<Device>();
+            while (resultSet.next()) {
+                Device device = new Device();
+                device.setId(resultSet.getInt(1));
+                device.setDescription(resultSet.getString(2));
+                device.setName(resultSet.getString(3));
+                device.setDateOfEnrollment(resultSet.getLong(4));
+                device.setDateOfLastUpdate(resultSet.getLong(5));
+                //TODO:- Ownership is not a enum in DeviceDAO
+                device.setOwnerShip(resultSet.getString(6));
+                device.setStatus(Status.valueOf(resultSet.getString(7)));
+                device.setDeviceTypeId(resultSet.getInt(8));
+                device.setDeviceIdentificationId(resultSet.getString(9));
+                device.setOwnerId(resultSet.getString(10));
+                device.setTenantId(resultSet.getInt(11));
+                devicesList.add(device);
+            }
+        } catch (SQLException e) {
+            String msg = "Error occurred while listing devices for type '" + type + "'";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
+        } finally {
+            DeviceManagementDAOUtil.cleanupResources(conn, stmt, resultSet);
+        }
+        return devicesList;
+    }
+
     private Connection getConnection() throws DeviceManagementDAOException {
         try {
             return dataSource.getConnection();

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceTypeDAOImpl.java

@@ -19,7 +19,6 @@ package org.wso2.carbon.device.mgt.core.dao.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceTypeDAO;
 import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
@@ -90,9 +89,28 @@ public class DeviceTypeDAOImpl implements DeviceTypeDAO {
     }
 
     @Override
-    public DeviceIdentifier getDeviceType() throws DeviceManagementDAOException {
+    public DeviceType getDeviceType(Integer id) throws DeviceManagementDAOException {
-        //TODO:
+        Connection conn = this.getConnection();
-        return null;
+        PreparedStatement stmt = null;
+        DeviceType deviceType = null;
+        try {
+            stmt = conn.prepareStatement("SELECT ID AS DEVICE_TYPE_ID, NAME AS DEVICE_TYPE FROM DM_DEVICE_TYPE WHERE ID=?");
+            stmt.setInt(1, id);
+            ResultSet results = stmt.executeQuery();
+
+            while (results.next()) {
+                deviceType = new DeviceType();
+                deviceType.setId(results.getLong("DEVICE_TYPE_ID"));
+                deviceType.setName(results.getString("DEVICE_TYPE"));
+            }
+        } catch (SQLException e) {
+            String msg = "Error occurred while fetching the registered device type";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
+        } finally {
+            DeviceManagementDAOUtil.cleanupResources(conn, stmt, null);
+        }
+        return deviceType;
     }
 
     @Override

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java

@@ -18,8 +18,10 @@ package org.wso2.carbon.device.mgt.core.dao.util;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dto.Device;
+import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.dto.Status;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.user.api.UserStoreException;
@@ -32,7 +34,9 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.List;
 
 public final class DeviceManagementDAOUtil {
 
@@ -101,6 +105,44 @@ public final class DeviceManagementDAOUtil {
         }
     }
 
+    /**
+     * @param device - The DTO device object.
+     * @return A Business Object.
+     */
+    public static org.wso2.carbon.device.mgt.common.Device convertDevice(Device device){
+        org.wso2.carbon.device.mgt.common.Device deviceBO =
+                new org.wso2.carbon.device.mgt.common.Device();
+        deviceBO.setDateOfEnrolment(device.getDateOfEnrollment());
+        deviceBO.setDateOfLastUpdate(device.getDateOfLastUpdate());
+        deviceBO.setDescription(device.getDescription());
+        deviceBO.setDeviceIdentifier(device.getDeviceIdentificationId());
+        deviceBO.setDeviceTypeId(device.getDeviceTypeId());
+        deviceBO.setName(device.getName());
+        deviceBO.setId(device.getId());
+        deviceBO.setOwner(device.getOwnerId());
+        deviceBO.setOwnership(device.getOwnerShip());
+        if (device.getStatus() == Status.ACTIVE) {
+            deviceBO.setStatus(true);
+        } else if (device.getStatus() == Status.INACTIVE) {
+            deviceBO.setStatus(false);
+        }
+        return null;
+    }
+
+    /**
+     * @param devices - DTO Device Object list.
+     * @return  converted Business Object list.
+     */
+    public static List<org.wso2.carbon.device.mgt.common.Device> convertDevices(
+            List<Device> devices) {
+        List<org.wso2.carbon.device.mgt.common.Device> deviceBOList =
+                new ArrayList<org.wso2.carbon.device.mgt.common.Device>();
+        for (Device device : devices) {
+            deviceBOList.add(convertDevice(device));
+        }
+        return deviceBOList;
+    }
+
     public static Device convertDevice(org.wso2.carbon.device.mgt.common.Device
                                                device) throws DeviceManagementDAOException {
         Device deviceBO = new Device();
@@ -121,4 +163,10 @@ public final class DeviceManagementDAOUtil {
         return deviceBO;
     }
 
+    public static DeviceIdentifier createDeviceIdentifier(Device device, DeviceType deviceType) {
+        DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
+        deviceIdentifier.setType(deviceType.getName());
+        deviceIdentifier.setId(device.getDeviceIdentificationId());
+        return deviceIdentifier;
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/Device.java

@@ -23,7 +23,7 @@ import java.io.Serializable;
 public class Device implements Serializable {
 
     private static final long serialVersionUID = -8101106997837486245L;
-    private String id;
+    private Integer id;
     private String description;
     private String name;
     private Long dateOfEnrollment;
@@ -33,21 +33,21 @@ public class Device implements Serializable {
     private String ownerId;
     private String ownerShip;
     private int tenantId;
-    private Integer deviceType;
+    private Integer deviceTypeId;
 
-    public Integer getDeviceType() {
+    public Integer getDeviceTypeId() {
-        return deviceType;
+        return deviceTypeId;
     }
 
-    public void setDeviceType(Integer deviceType) {
+    public void setDeviceTypeId(Integer deviceTypeId) {
-        this.deviceType = deviceType;
+        this.deviceTypeId = deviceTypeId;
     }
 
-    public String getId() {
+    public Integer getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java

@@ -147,7 +147,7 @@ public class DeviceManagementDAOTests {
         DeviceType deviceType = new DeviceType();
         deviceType.setId(Long.parseLong("1"));
 
-        device.setDeviceType(deviceType.getId().intValue());
+        device.setDeviceTypeId(deviceType.getId().intValue());
         device.setOwnerShip(OwnerShip.BYOD.toString());
         device.setOwnerId("111");
         device.setTenantId(-1234);

components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml

@@ -1,21 +1,21 @@
 <?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,
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
-~ Version 2.0 (the "License"); you may not use this file except
+  ~ you may not use this file except in compliance with the License.
-~ 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,
+  ~ Unless required by applicable law or agreed to in writing, software
-~ software distributed under the License is distributed on an
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ KIND, either express or implied.  See the License for the
+  ~ See the License for the specific language governing permissions and
-~ specific language governing permissions and limitations
+  ~ limitations under the License.
-~ under the License.
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>

components/policy-mgt/org.wso2.carbon.policy.evalutor/src/main/java/org/wso2/carbon/policy/evaluator/PDPException.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) 2005-2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.evaluator;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml

@@ -1,21 +1,21 @@
 <?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,
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
-~ Version 2.0 (the "License"); you may not use this file except
+  ~ you may not use this file except in compliance with the License.
-~ 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,
+  ~ Unless required by applicable law or agreed to in writing, software
-~ software distributed under the License is distributed on an
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ KIND, either express or implied.  See the License for the
+  ~ See the License for the specific language governing permissions and
-~ specific language governing permissions and limitations
+  ~ limitations under the License.
-~ under the License.
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/Feature.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) 2005-2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.common;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/FeatureManagementException.java

@@ -1,19 +1,17 @@
 /*
  * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.common;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/FeatureManagerService.java

@@ -1,27 +1,21 @@
 /*
-*  Copyright (c) 2014 WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
-
 package org.wso2.carbon.policy.mgt.common;
 
-import org.wso2.carbon.policy.mgt.common.Feature;
-import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
-
 import java.util.List;
 
 public interface FeatureManagerService {

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/Policy.java

@@ -1,19 +1,17 @@
 /*
  * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.common;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyManagementException.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) 2005-2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.common;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyManagerService.java

@@ -1,27 +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,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.common;
 
-import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
-import org.wso2.carbon.policy.mgt.common.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-
 /**
  * This interface defines the policy management which should be implemented by the plugins
  */

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/impl/PolicyManagement.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.common.impl;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/test/java/org/wos2/carbon/policy/mgt/common/PolicyManagementTestCase.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) 2005-2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wos2.carbon.policy.mgt.common;
@@ -36,7 +34,6 @@ public class PolicyManagementTestCase {
 
     private PolicyManagement policyManagement = new PolicyManagement();
 
-
     @Test(groups = "policy.mgt.test", description = "Testing the adding policy to a device")
     public void testAddPolicy() throws FeatureManagementException, PolicyManagementException {
         Assert.assertEquals(policyManagement.addPolicyToDevice("1212-ESDD-12ER-7890", "MD", policy), 0);

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/test/java/org/wos2/carbon/policy/mgt/common/utils/PolicyCreator.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wos2.carbon.policy.mgt.common.utils;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml

@@ -1,21 +1,21 @@
 <?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,
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
-~ Version 2.0 (the "License"); you may not use this file except
+  ~ you may not use this file except in compliance with the License.
-~ 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,
+  ~ Unless required by applicable law or agreed to in writing, software
-~ software distributed under the License is distributed on an
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ KIND, either express or implied.  See the License for the
+  ~ See the License for the specific language governing permissions and
-~ specific language governing permissions and limitations
+  ~ limitations under the License.
-~ under the License.
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/config/PolicyConfigurationManager.java

@@ -1,16 +1,17 @@
 /*
  * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * in compliance with 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,
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * software distributed under the License is distributed on an
+ *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * Unless required by applicable law or agreed to in writing, software
- * KIND, either express or implied. See the License for the
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * specific language governing permissions and limitations
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.config;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/config/PolicyManagementConfig.java

@@ -1,17 +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
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * in compliance with 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,
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * software distributed under the License is distributed on an
+ *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * Unless required by applicable law or agreed to in writing, software
- * KIND, either express or implied. See the License for the
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * specific language governing permissions and limitations
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package org.wso2.carbon.policy.mgt.core.config;
 
 import javax.xml.bind.annotation.XmlElement;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/config/PolicyManagementRepository.java

@@ -1,17 +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
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * in compliance with 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,
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * software distributed under the License is distributed on an
+ *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * Unless required by applicable law or agreed to in writing, software
- * KIND, either express or implied. See the License for the
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * specific language governing permissions and limitations
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package org.wso2.carbon.policy.mgt.core.config;
 
 import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/config/datasource/DataSourceConfig.java

@@ -1,16 +1,17 @@
 /*
  * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * in compliance with 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,
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * software distributed under the License is distributed on an
+ *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * Unless required by applicable law or agreed to in writing, software
- * KIND, either express or implied. See the License for the
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * specific language governing permissions and limitations
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.config.datasource;
@@ -24,15 +25,14 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "DataSourceConfiguration")
 public class DataSourceConfig {
 
-	private JNDILookupDefinition jndiLookupDefintion;
+	private JNDILookupDefinition jndiLookupDefinition;
 
 	@XmlElement(name = "JndiLookupDefinition", nillable = true)
-	public JNDILookupDefinition getJndiLookupDefintion() {
+	public JNDILookupDefinition getJndiLookupDefinition() {
-		return jndiLookupDefintion;
+		return jndiLookupDefinition;
 	}
 
-	public void setJndiLookupDefintion(JNDILookupDefinition jndiLookupDefintion) {
+	public void setJndiLookupDefinition(JNDILookupDefinition jndiLookupDefinition) {
-		this.jndiLookupDefintion = jndiLookupDefintion;
+		this.jndiLookupDefinition = jndiLookupDefinition;
 	}
-
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/config/datasource/JNDILookupDefinition.java

@@ -1,16 +1,17 @@
 /*
  * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * in compliance with 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,
+ *       http://www.apache.org/licenses/LICENSE-2.0
- * software distributed under the License is distributed on an
+ *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * Unless required by applicable law or agreed to in writing, software
- * KIND, either express or implied. See the License for the
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * specific language governing permissions and limitations
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.config.datasource;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/PolicyDAO.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.dao;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/PolicyManagementDAOFactory.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.dao;
@@ -55,7 +53,7 @@ public class PolicyManagementDAOFactory {
             throw new RuntimeException("Device Management Repository data source configuration " +
                     "is null and thus, is not initialized");
         }
-        JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion();
+        JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition();
         if (jndiConfig != null) {
             if (log.isDebugEnabled()) {
                 log.debug("Initializing Device Management Repository data source using the JNDI " +

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/PolicyManagerDAOException.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.dao;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.dao.impl;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/util/PolicyManagementDAOUtil.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.dao.util;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/internal/PolicyManagementDataHolder.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.internal;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/internal/PolicyManagementServiceComponent.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.wso2.carbon.policy.mgt.core.internal;
 
 import org.apache.commons.logging.Log;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagementConstants.java

@@ -1,24 +1,21 @@
 /*
-*  Copyright (c) 2014 WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.util;
 
 public final class PolicyManagementConstants {
-
     public static final String DEVICE_CONFIG_XML_NAME = "cdm-config.xml";
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagerUtil.java

@@ -1,19 +1,17 @@
 /*
-*  Copyright (c) 2014 WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
-*  WSO2 Inc. licenses this file to you under the Apache License,
+ * Licensed under the Apache License, Version 2.0 (the "License");
-*  Version 2.0 (the "License"); you may not use this file except
+ * you may not use this file except in compliance with the License.
-*  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,
+ * Unless required by applicable law or agreed to in writing, software
-* software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
-* specific language governing permissions and limitations
+ * limitations under the License.
-* under the License.
  */
 
 package org.wso2.carbon.policy.mgt.core.util;
@@ -61,7 +59,7 @@ public class PolicyManagerUtil {
             throw new RuntimeException("Device Management Repository data source configuration " +
                     "is null and thus, is not initialized");
         }
-        JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion();
+        JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition();
         if (jndiConfig != null) {
             if (log.isDebugEnabled()) {
                 log.debug("Initializing Device Management Repository data source using the JNDI " +

components/policy-mgt/pom.xml

@@ -1,20 +1,19 @@
 <?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,
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
-~ Version 2.0 (the "License"); you may not use this file except
+  ~ you may not use this file except in compliance with the License.
-~ 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,
+  ~ Unless required by applicable law or agreed to in writing, software
-~ software distributed under the License is distributed on an
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ KIND, either express or implied.  See the License for the
+  ~ See the License for the specific language governing permissions and
-~ specific language governing permissions and limitations
+  ~ limitations under the License.
-~ under the License.
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"

features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

features/policy-mgt/pom.xml

@@ -1,20 +1,19 @@
 <?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,
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
-~ Version 2.0 (the "License"); you may not use this file except
+  ~ you may not use this file except in compliance with the License.
-~ 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,
+  ~ Unless required by applicable law or agreed to in writing, software
-~ software distributed under the License is distributed on an
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ KIND, either express or implied.  See the License for the
+  ~ See the License for the specific language governing permissions and
-~ specific language governing permissions and limitations
+  ~ limitations under the License.
-~ under the License.
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Operation.java

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * 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 cdm.api.android.common.AndroidAgentException;
-import cdm.api.android.util.AndroidAPIUtils;
-import cdm.api.android.util.Message;
-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 javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import java.util.List;
-
-/**
- * Android Device Operation REST-API implementation.
- */
-@Produces({ "application/json", "application/xml" })
-@Consumes({ "application/json", "application/xml" })
-public class Operation {
-
-	private static Log log = LogFactory.getLog(Operation.class);
-
-	@GET
-	@Path("{id}")
-	public List<org.wso2.carbon.device.mgt.common.Operation> getAllOperations(
-			@PathParam("id") String id) throws
-	                                    AndroidAgentException {
-		List<org.wso2.carbon.device.mgt.common.Operation> operations;
-		String msg;
-		DeviceManagementService dmService;
-
-		try {
-			dmService = AndroidAPIUtils.getDeviceManagementService();
-		} catch (DeviceManagementServiceException deviceMgtServiceEx) {
-			msg = "Device management service error";
-			log.error(msg, deviceMgtServiceEx);
-			throw new AndroidAgentException(msg, deviceMgtServiceEx);
-		}
-
-		try {
-			DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id);
-			operations = dmService.getOperationManager(
-					DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID)
-			                      .getOperations(deviceIdentifier);
-			Response.status(HttpStatus.SC_OK);
-			return operations;
-		} catch (DeviceManagementException e) {
-			msg = "Error occurred while fetching the operation manager for the device type.";
-			log.error(msg, e);
-			Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			throw new AndroidAgentException(msg, e);
-		} catch (OperationManagementException e) {
-			msg = "Error occurred while fetching the operation list for the device.";
-			log.error(msg, e);
-			Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			throw new AndroidAgentException(msg, e);
-		}
-	}
-
-	@PUT
-	public Message updateOperation() throws
-	                                 AndroidAgentException {
-		String msg;
-		DeviceManagementService dmService;
-		Message responseMsg = new Message();
-
-		try {
-			dmService = AndroidAPIUtils.getDeviceManagementService();
-
-		} catch (DeviceManagementServiceException deviceMgtServiceEx) {
-			msg = "Device management service error";
-			log.error(msg, deviceMgtServiceEx);
-			throw new AndroidAgentException(msg, deviceMgtServiceEx);
-		}
-
-		try {
-			boolean result = dmService.getOperationManager("").addOperation(null, null);
-			if (result) {
-				Response.status(HttpStatus.SC_OK);
-				responseMsg.setResponseMessage("Device has already enrolled");
-			} else {
-				Response.status(HttpStatus.SC_NOT_FOUND);
-				responseMsg.setResponseMessage("Operation not found");
-			}
-			return responseMsg;
-		} catch (DeviceManagementException e) {
-			msg = "Error occurred while fetching the operation manager for the device type.";
-			log.error(msg, e);
-			Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			throw new AndroidAgentException(msg, e);
-		} catch (OperationManagementException e) {
-			msg = "Error occurred while updating the operation status for the device.";
-			log.error(msg, e);
-			Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			throw new AndroidAgentException(msg, e);
-		}
-	}
-}

product/modules/distribution/src/repository/resources/rxts/license.rxt

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<artifactType type="application/vnd.wso2-license+xml" shortName="license" singularLabel="License" pluralLabel="Licenses"
+              hasNamespace="false" iconSet="10">
+    <storagePath>/license/@{overview_provider}/@{overview_name}/@{overview_version}</storagePath>
+    <nameAttribute>overview_name</nameAttribute>
+    <ui>
+        <list>
+            <column name="Provider">
+                <data type="path" value="overview_provider" href="@{storagePath}"/>
+            </column>
+            <column name="Name">
+                <data type="path" value="overview_name" href="@{storagePath}"/>
+            </column>
+            <column name="Version">
+                <data type="path" value="overview_version" href="@{storagePath}"/>
+            </column>
+        </list>
+    </ui>
+    <content>
+        <table name="Overview">
+            <field type="text" required="true">
+                <name>Provider</name>
+            </field>
+            <field type="text" required="true">
+                <name>Name</name>
+            </field>
+            <field type="text" required="true">
+                <name>Version</name>
+            </field>
+            <field type="text">
+                <name>Createdtime</name>
+            </field>
+            <field type="text-area">
+                <name>License</name>
+            </field>
+        </table>
+    </content>
+</artifactType>