community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge pull conflicts

Browse Source
This commit is contained in:
hasuniea 2015-12-21 14:34:05 +05:30
commit ac0d06d465
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,8 @@ public class AuthenticatorConfig {
this.className = className;
}
@XmlElementWrapper(name="Parameters", nillable=true)
@XmlElement(name="Parameter", nillable=false)
@XmlElementWrapper(name = "Parameters", nillable = true)
@XmlElement(name = "Parameter", nillable = false)
public List<Parameter> getParams() {
return this.params;
}
@ -55,12 +55,13 @@ public class AuthenticatorConfig {
public void setParams(List<Parameter> params) {
this.params = params;
}
@XmlRootElement(name="Parameter")
@XmlRootElement(name = "Parameter")
public static class Parameter {
private String name;
private String value;
@XmlAttribute(name="Name")
@XmlAttribute(name = "Name")
public String getName() {
return this.name;
}

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

@ -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();

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

@ -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>