merge pull conflicts

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

@@ -55,6 +55,7 @@ public class AuthenticatorConfig {
     public void setParams(List<Parameter> params) {
         this.params = params;
     }
+
     @XmlRootElement(name = "Parameter")
     public static class Parameter {
         private String name;

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

@@ -78,7 +78,8 @@ public class WebappAuthenticatorFrameworkServiceComponent {
             WebappAuthenticatorConfig.init();
             WebappAuthenticatorRepository repository = new WebappAuthenticatorRepository();
             for (AuthenticatorConfig config : WebappAuthenticatorConfig.getInstance().getAuthenticators()) {
-                WebappAuthenticator authenticator = (WebappAuthenticator)Class.forName(config.getClassName()).newInstance();
+                WebappAuthenticator authenticator =
+                        (WebappAuthenticator) Class.forName(config.getClassName()).newInstance();
 
                 if ((config.getParams() != null) && (!config.getParams().isEmpty())) {
                     Properties properties = new Properties();

features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml

@@ -4,12 +4,12 @@
 			<Name>OAuth</Name>
 			<ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.OAuthAuthenticator</ClassName>
             <Parameters>
-                <Parameter name="IsRemote">true</Parameter>
-                <Parameter name="TokenValidationEndpointUrl">https://localhost:9443</Parameter>
-                <Parameter name="Username">admin</Parameter>
-                <Parameter name="Password">admin</Parameter>
-                <Parameter name="MaxTotalConnections">100</Parameter>
-                <Parameter name="MaxConnectionsPerHost">100</Parameter>
+                <Parameter Name="IsRemote">true</Parameter>
+                <Parameter Name="TokenValidationEndpointUrl">https://localhost:9443</Parameter>
+                <Parameter Name="Username">admin</Parameter>
+                <Parameter Name="Password">admin</Parameter>
+                <Parameter Name="MaxTotalConnections">100</Parameter>
+                <Parameter Name="MaxConnectionsPerHost">100</Parameter>
             </Parameters>
 		</Authenticator>
         <Authenticator>