Partial Commit

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/Permission.java

@@ -24,8 +24,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "Permission")
 public class Permission{
 
-	private String name;
+	private String name; // permission name
-	private String path;
+	private String path; // permission string
+    private String url; // url of the resource
+    private String method; // http method
 
 	public String getName() {
 		return name;
@@ -44,4 +46,22 @@ public class Permission{
 	public void setPath(String path) {
 		this.path = path;
 	}
+
+    public String getUrl() {
+        return url;
+    }
+
+    @XmlElement(name = "url", required = true)
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    @XmlElement(name = "method", required = true)
+    public void setMethod(String method) {
+        this.method = method;
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/PermissionConfiguration.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * you may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.device.mgt.core.config.permission;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement(name = "PermissionConfiguration")
-public class PermissionConfiguration {
-
-	private List<Permission> permissions;
-
-	public List<Permission> getPermissions() {
-		return permissions;
-	}
-
-	@XmlElement(name = "Permission", required = true)
-	public void setPermissions(List<Permission> permissions) {
-		this.permissions = permissions;
-	}
-}

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/WebappAuthenticatorFrameworkValve.java

@@ -27,14 +27,8 @@ import org.wso2.carbon.tomcat.ext.valves.CompositeValve;
 import org.wso2.carbon.webapp.authenticator.framework.authenticator.WebappAuthenticator;
 
 import javax.servlet.http.HttpServletResponse;
-<<<<<<< HEAD
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-=======
 import java.util.Arrays;
 import java.util.List;
->>>>>>> e1a74e049dbebd513910e9ed69226f488d73c314
 
 public class WebappAuthenticatorFrameworkValve extends CarbonTomcatValve {